diff --git a/etc/raspbian/config.mk.in b/etc/raspbian/config.mk.in
index 0d8886a..eefece1 100644
--- a/etc/raspbian/config.mk.in
+++ b/etc/raspbian/config.mk.in
@@ -20,11 +20,11 @@ GHASHPREC = 7
 JSON_INDENT ?= no
 MOSQUITTO_INC = -I/usr/include
 MOSQUITTO_LIB = -L/usr/lib
-MORELIBS = -luuid
+MORELIBS = -luuid # -lssl
 
-LUA_CFLAGS = -I/usr/include/lua5.2 -llua5.2
-LUA_LIBS   = -L /usr/lib/arm-linux-gnueabihf/
-SODIUM_CFLAGS = 
-SODIUM_LIBS   = -lsodium
+LUA_CFLAGS = `pkg-config --cflags lua`
+LUA_LIBS   = `pkg-config --libs lua`
+SODIUM_CFLAGS = `pkg-config --cflags libsodium`
+SODIUM_LIBS   = `pkg-config --libs libsodium`
 
 GEOCODE_TIMEOUT = 4000
diff --git a/etc/raspbian/fpm-make.sh b/etc/raspbian/fpm-make.sh
index 47f5df1..b09e61e 100755
--- a/etc/raspbian/fpm-make.sh
+++ b/etc/raspbian/fpm-make.sh
@@ -13,9 +13,7 @@ name="ot-recorder"
 # add -0 to indicate "not in Debian" as per Roger's suggestion
 version="$(awk 'NR==1 {print $NF;}' version.h | sed -e 's/"//g' )-0-deb$(cat /etc/debian_version)"
 
-# arch=$(uname -m)
-arch=armhf
-
+arch=$(uname -m)
 case $arch in
 	armv7l) arch=armhf;;
 esac
@@ -26,6 +24,7 @@ rm -f "${debfile}"
 
 libcurl='libcurl3'
 libsodium='libsodium13'
+liblua='liblua5.2-0'
 case $(cat /etc/debian_version) in
 	8.8) ;;
 	9.*) libsodium="libsodium18" ;;
@@ -33,6 +32,11 @@ case $(cat /etc/debian_version) in
 		libsodium="libsodium23"
 		libcurl="libcurl3-gnutls"
 		;;
+        11.*)
+                libsodium="libsodium23"
+                libcurl="libcurl4"
+                liblua="liblua5.4-0"
+                ;;
 esac
 
 fpm -s dir \
@@ -49,10 +53,11 @@ fpm -s dir \
         -p ${debfile} \
         -d "${libcurl}" \
         -d "libmosquitto1" \
-        -d "liblua5.2-0" \
+        -d "${liblua}" \
         -d "libconfig9" \
         -d "${libsodium}" \
         -d "liblmdb0" \
+        -d "libuuid1" \
 	--config-files etc/default/ot-recorder \
         --post-install etc/debian/postinst \
         usr var etc