diff --git a/Makefile b/Makefile
index a948ec4..52f8bbe 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,13 @@ all: install
 
 install:	
 	install -d $(DESTDIR)/var/lib/dpkg
-	install -d $(DESTDIR)/bin
-	cp -a swim $(DESTDIR)/bin/swim
-	install -d $(DESTDIR)/lib/perl5/SWIM
-	cp -f Conf.pm $(DESTDIR)/lib/perl5/SWIM/Conf.pm
-	cp -fa lib/* $(DESTDIR)/lib/perl5/SWIM
-	install -d $(DESTDIR)/lib/SWIM 
-	cp -fa bin/* $(DESTDIR)/lib/SWIM
+	install -d $(DESTDIR)/usr/bin
+	cp -a swim $(DESTDIR)/usr/bin/swim
+	install -d $(DESTDIR)/usr/share/perl5/SWIM
+	cp -fa SWIM/*pm $(DESTDIR)/usr/share/perl5/SWIM
+	install -d $(DESTDIR)/usr/lib/SWIM 
+	cp -fa bin/* $(DESTDIR)/usr/lib/SWIM
 	install -d $(DESTDIR)/etc/swim
-	cp -f swimz.list $(DESTDIR)/etc/swim
 	cp -f swimrc $(DESTDIR)/etc/swim
 
 remove: