diff --git a/debian/rules b/debian/rules
index 2147da5..81a69a7 100644
--- a/debian/rules
+++ b/debian/rules
@@ -55,14 +55,14 @@ install: build
 	# Build package
 	make all
 
-	# Install lib3270
-	make DESTDIR=$(PWD)/debian/lib3270 install-linux-lib
-	find $(PWD)/debian/lib3270 -type f | sed -e "s@^$(PWD)/debian/lib3270/@/@g" > $(PWD)/debian/lib3270.install
+	# Install library
+	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME) install-linux-lib
 
 	# Install dev
-	make DESTDIR=$(PWD)/debian/lib3270-dev install-dev
-	find $(PWD)/debian/lib3270-dev -type f | sed -e "s@^$(PWD)/debian/lib3270-dev/@/@g" > $(PWD)/debian/lib3270-dev.install
-
+	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev install-dev
+	mkdir -p $(PWD)/debian/$(PACKAGE_NAME)-dev/usr/lib
+	mv $(PWD)/debian/$(PACKAGE_NAME)/usr/lib/*.so $(PWD)/debian/$(PACKAGE_NAME)-dev/usr/lib
+  
 	# --- end custom part for installing
 
 # Build architecture-independent files here.
@@ -88,7 +88,7 @@ binary-arch: build install
 #	dh_undocumented
 	dh_installchangelogs
 	dh_link
-	dh_strip --dbg-package=lib3270-dbg
+	dh_strip --dbg-package=$(PACKAGE_NAME)-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
--
libgit2 0.21.2