diff --git a/Makefile b/Makefile
index c2e55f7..107da70 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 
 CFLAGS := $(CFLAGS) -std=c11 $(SHARED_FLAGS) -Wmissing-prototypes
 CXXFLAGS := $(call safe_flag,-std=c++17,-std=c++14) $(SHARED_FLAGS)
-LDFLAGS := $(LDFLAGS) -Wl,--as-needed,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text
+LDFLAGS := $(LDFLAGS) -Wl,-soname=libhardened_malloc.so,--as-needed,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text
 TIDY_CHECKS := -checks=bugprone-*,-bugprone-macro-parentheses,cert-*,clang-analyzer-*,readability-*,-readability-inconsistent-declaration-parameter-name,-readability-magic-numbers,-readability-named-parameter,-bugprone-too-small-loop-variable
 
 SOURCES := chacha.c h_malloc.c memory.c pages.c random.c util.c
diff --git a/debian/control b/debian/control
index 4a11a7a..bf9de44 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@
 ## See the file COPYING for copying conditions.
 
 Source: hardened-malloc
-Section: misc
+Section: libs
 Priority: optional
 Maintainer: Patrick Schleizer <adrelanos@riseup.net>
 Build-Depends: debhelper (>= 12), genmkfile
diff --git a/debian/rules b/debian/rules
index 4e8b082..bc23ff0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,5 @@ include /usr/share/dpkg/buildflags.mk
 override_dh_installchangelogs:
 	dh_installchangelogs changelog.upstream upstream
 
-## https://github.com/GrapheneOS/hardened_malloc/issues/85
-override_dh_dwz:
-	/bin/true
-
 override_dh_auto_build:
 	dh_auto_build -- CONFIG_NATIVE=false
diff --git a/make-helper-overrides.bsh b/make-helper-overrides.bsh
index c85c167..b915c29 100755
--- a/make-helper-overrides.bsh
+++ b/make-helper-overrides.bsh
@@ -5,11 +5,8 @@
 
 make_install_hook_post() {
    if [ ! -d "$DESTDIR/usr/lib" ]; then
-      mkdir --parents "$DESTDIR/usr/lib"
+      mkdir --parents "$DESTDIR/usr/lib/libhardened_malloc.so"
    fi
-   cp libhardened_malloc.so "$DESTDIR/usr/lib/libhardened_malloc.so"
+   cp libhardened_malloc.so "$DESTDIR/usr/lib/libhardened_malloc.so/libhardened_malloc.so"
 }
 
-make_all_hook_post() {
-   make libhardened_malloc.so
-}