diff --git a/helpers/DATA/ubiquity/crash_report_point_to_trisquel_forge.patch b/helpers/DATA/ubiquity/crash_report_point_to_trisquel_forge.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3ccbf5cbb6d8b69efbfb0c330aa1e7a928f44c75
--- /dev/null
+++ b/helpers/DATA/ubiquity/crash_report_point_to_trisquel_forge.patch
@@ -0,0 +1,29 @@
+diff --git a/debian/ubiquity.templates b/debian/ubiquity.templates
+index 8b459bf..4f66e46 100644
+--- a/debian/ubiquity.templates
++++ b/debian/ubiquity.templates
+@@ -335,11 +335,19 @@ _Description: Installer crashed
+ Template: ubiquity/text/crash_text_label
+ Type: text
+ _Description:
+- We're sorry; the installer crashed. After you close this window, we'll
+- allow you to file a bug report using the integrated bug reporting tool.
+- This will gather information about your system and your installation
+- process. The details will be sent to our bug tracker and a developer
+- will attend to the problem as soon as possible.
++ We're sorry; the installer crashed. Please open an issue at
++ <a href="https://gitlab.trisquel.org/groups/trisquel/-/issues">
++ Trisquel's bug tracker</a> with as much details as posible to follow
++ up by the development team.
++ .
++ The suggested directory to gather information is /var/log, specially:
++ .
++ syslog,
++ dmesg,
++ installer,
++ partman
++ .
++ Thank you for your collaboration.
+ 
+ Template: ubiquity/text/a11y_high_contrast
+ Type: text
diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 07194e04f7174f58c1c8ecfeb5b468c242c4c915..3d33c6459d6ee6e4a74128d391282d1605a67c07 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -18,15 +18,21 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=33
+VERSION=34
 
 . ./config
 
 # Disable confirmation popups, as they are innacurate and buggy
-patch -p1 < $DATA/no_confrirmation_when_crypto.patch
+patch --no-backup-if-mismatch -p1 < $DATA/no_confrirmation_when_crypto.patch
 
 # Fix some gtk labels for Orca
-patch -p1 < $DATA/a11y.patch
+patch --no-backup-if-mismatch -p1 < $DATA/a11y.patch
+
+# Point ubiquity crash to trisquel's forge.
+patch --no-backup-if-mismatch -p1 < $DATA/crash_report_point_to_trisquel_forge.patch
+
+# Remove test_timezone to prevent error out future builds on different daylight time.
+rm tests/test_timezone.py
 
 # Revert changes to advanced features page
 cp $DATA/stepPartAsk.ui gui/gtk/stepPartAsk.ui