diff --git a/USER_MANUAL.md b/USER_MANUAL.md
index da9da2d5..691fe1eb 100644
--- a/USER_MANUAL.md
+++ b/USER_MANUAL.md
@@ -971,7 +971,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
     * Restore heard station list on launch. (PR #1358) - thanks @barjac!
     * Add momentary PTT option to FreeDV. (PR #1393)
     * Allow 8k sample rate for 'radio' devices. (PR #1416)
-    * FreeDV Reporter: Connect to server via TLS by default. (PR #1422)
+    * FreeDV Reporter: Connect to server via TLS by default. (PR #1422, #1427)
     * Block special characters in recording file name suffixes and default the voice keyer file selector to show .wav and .mp3. (PR #1424) - thanks @barjac!
 3. Build system:
     * Clear CMake deprecation warnings in FreeDV. (PR #1383, #1386)
diff --git a/appimage/AppRun.sh b/appimage/AppRun.sh
new file mode 100644
index 00000000..16856669
--- /dev/null
+++ b/appimage/AppRun.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+echo "In AppImage AppRun"
+cd "$APPDIR"
+export SSL_CERT_FILE="$APPDIR/etc/ssl/certs/ca-certificates.crt"
+export SSL_CERT_DIR="$APPDIR/etc/ssl/certs"
+echo "#### after import"
+exec "$APPDIR/usr/bin/freedv" "$@"
diff --git a/appimage/FreeDV-FlexRadio.desktop b/appimage/FreeDV-FlexRadio.desktop
deleted file mode 100644
index 55704391..00000000
--- a/appimage/FreeDV-FlexRadio.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=FreeDV-FlexRadio
-Exec=freedv-flex
-Icon=freedv256x256
-Type=Application
-Categories=Utility;
diff --git a/appimage/FreeDV-KA9Q.desktop b/appimage/FreeDV-KA9Q.desktop
deleted file mode 100644
index 5f8b8715..00000000
--- a/appimage/FreeDV-KA9Q.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=FreeDV-KA9Q
-Exec=freedv-ka9q
-Icon=freedv256x256
-Type=Application
-Categories=Utility;
diff --git a/appimage/make-appimage.sh b/appimage/make-appimage.sh
index 4e083749..2dabac36 100755
--- a/appimage/make-appimage.sh
+++ b/appimage/make-appimage.sh
@@ -33,8 +33,14 @@ fi
   --executable "$APPEXEC" \
   --appdir "$APPDIR" \
   --icon-file ../contrib/freedv256x256.png \
+  --custom-apprun "AppRun.sh" \
   --desktop-file $DESKTOP_FILE
 
+# Manually copy over /etc/ssl to APPDIR. Needed for OpenSSL to behave properly on non-Ubuntu
+# distros.
+mkdir -p "$APPDIR/etc/ssl/certs"
+cp -aL /etc/ssl/certs/* "$APPDIR/etc/ssl/certs"
+
 # Create the output
 ./linuxdeploy-${MACH_ARCH}.AppImage \
   --appdir "$APPDIR" \