diff --git a/configure.ac b/configure.ac
index 845e8487c..208a12b43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,9 +204,9 @@ AM_CONDITIONAL([JPEG], [test x$HAVE_JPEGLIB = x1])
 AC_DEFINE_UNQUOTED([HAVE_JPEGLIB], $HAVE_JPEGLIB, [Define to 1 if you have libjpeg installed])
 
 PKG_CHECK_MODULES(SSL, "openssl", [HAVE_OPENSSL=1])
-PKG_CHECK_VAR(SSL_PREFIX, "openssl", "exec_prefix",, AC_MSG_ERROR([Could not find exec_prefix for openssl]))
+AC_PATH_PROG(OPENSSL_PATH, openssl)
 AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $HAVE_OPENSSL, [Define to 1 if you have OpenSSL installed])
-AC_SUBST(SSL_PREFIX)
+AC_SUBST(OPENSSL_PATH)
 
 PKG_CHECK_MODULES(CURL, "libcurl", [HAVE_CURL=1])
 MAINVERSION=$(echo $PACKAGE_VERSION|sed -e 's/-.*$//')
diff --git a/debian/apparmor-profiles/beid b/debian/apparmor-profiles/beid
index 85c8cc1b6..3b5ee0ee1 100644
--- a/debian/apparmor-profiles/beid
+++ b/debian/apparmor-profiles/beid
@@ -3,4 +3,4 @@
   /etc/ld.so.conf.d/* r,
   /run/pcscd/pcscd.comm rw,
   /usr/lib/eid-mw/* ix,
-  /usr/bin/pinentry ix,
+  /usr/bin/pinentry* ix,
diff --git a/debian/beid-mozilla-extension.install b/debian/beid-mozilla-extension.install
index f5aab9e7c..7c90dc600 100644
--- a/debian/beid-mozilla-extension.install
+++ b/debian/beid-mozilla-extension.install
@@ -1 +1 @@
-debian/apparmor-profiles/beid etc/apparmor.d/abstractions/
+debian/apparmor-profiles/beid etc/apparmor.d/abstractions/ubuntu-browsers.d/
diff --git a/debian/beid-mozilla-extension.postinst b/debian/beid-mozilla-extension.postinst
deleted file mode 100644
index 16104b095..000000000
--- a/debian/beid-mozilla-extension.postinst
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#DEBHELPER#
-
-# ensure that beid AppArmor profile is enabled if it exists
-
-if [ -f /etc/apparmor.d/usr.bin.firefox ]; then
-	if [ -f /etc/apparmor.d/local/usr.bin.firefox ]; then
-		if ! grep -q abstractions/beid /etc/apparmor.d/local/usr.bin.firefox; then
-			cat >> /etc/apparmor.d/local/usr.bin.firefox <<EOF
-# For BeID
-  #include <abstractions/beid>
-EOF
-			apparmor_parser -r -W -T /etc/apparmor.d/usr.bin.firefox || true
-		fi
-	else
-		echo "IEK: usr.bin.firefox apparmor profile exists, but local/usr.bin.firefox does not. Can't fix up firefox profile!" >&2
-		exit 1;
-	fi
-fi
-
-if [ -f /etc/apparmor.d/usr.bin.firefox-esr ]; then
-	if [ -f /etc/apparmor.d/local/usr.bin.firefox-esr ]; then
-		if ! grep -q abstractions/beid /etc/apparmor.d/local/usr.bin.firefox-esr; then
-			cat >> /etc/apparmor.d/local/usr.bin.firefox-esr <<EOF
-# For BeID
-  #include <abstractions/beid>
-EOF
-			apparmor_parser -r -W -T /etc/apparmor.d/usr.bin.firefox-esr || true
-		fi
-	else
-		echo "IEK: usr.bin.firefox-esr apparmor profile exists, but local/usr.bin.firefox-esr does not. Can't fix up firefox-esr profile!" >&2
-		exit 1;
-	fi
-fi
diff --git a/debian/beid-mozilla-extension.triggers b/debian/beid-mozilla-extension.triggers
deleted file mode 100644
index 10f61211a..000000000
--- a/debian/beid-mozilla-extension.triggers
+++ /dev/null
@@ -1,2 +0,0 @@
-interest /etc/apparmor.d/usr.bin.firefox
-interest /etc/apparmor.d/usr.bin.firefox-esr
diff --git a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
index a25746d3d..43a6a83c6 100644
--- a/plugins_tools/eid-viewer/Makefile.am
+++ b/plugins_tools/eid-viewer/Makefile.am
@@ -217,7 +217,7 @@ dist_trust_DATA = \
 	certs/belgiumrca6.pem
 
 install-data-hook:
-	if ( $(SSL_PREFIX)/bin/openssl help 2>&1 | grep -q rehash); then $(SSL_PREFIX)/bin/openssl rehash $(DESTDIR)/$(trustdir); else $(SSL_PREFIX)/bin/c_rehash $(DESTDIR)/$(trustdir); fi
+	$(OPENSSL_PATH) rehash $(DESTDIR)/$(trustdir)
 
 gtk/viewer_glade.h: gtk/viewer.glade
 	$(top_srcdir)/plugins_tools/aboutmw/gtk/gen.sh VIEWER_GLADE_H VIEWER_GLADE_STRING < $^ > $@