diff --git a/CHANGES b/CHANGES
index 1afb314..50d56fd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Release 9.3-dev
 * fix for ssh to support -M or ip/range
 * for vnc/cisco/... protocols that only check for a password, skip host
   after the password is found
+* added "make uninstall"
 
 
 Release 9.2
diff --git a/Makefile b/Makefile
index 372e67e..0fc0d2e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,3 +3,6 @@ all:
 
 clean:
 	cp -f Makefile.orig Makefile
+
+uninstall:
+	@echo Error: you must run "./configure" first
diff --git a/Makefile.am b/Makefile.am
index 1cd9156..a85c99d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,3 +89,9 @@ clean:
 	rm -rf xhydra pw-inspector hydra *.o core *.core *.stackdump *~ Makefile.in Makefile dev_rfc hydra.restore arm/*.ipk arm/ipkg/usr/bin/* hydra-gtk/src/*.o hydra-gtk/src/xhydra hydra-gtk/stamp-h hydra-gtk/config.status hydra-gtk/errors hydra-gtk/config.log hydra-gtk/src/.deps hydra-gtk/src/Makefile hydra-gtk/Makefile
 	cp -f Makefile.orig Makefile
 
+uninstall:
+	-rm -f $(DESTDIR)$(PREFIX)$(BINDIR)/xhydra $(DESTDIR)$(PREFIX)$(BINDIR)/hydra $(DESTDIR)$(PREFIX)$(BINDIR)/pw-inspector $(DESTDIR)$(PREFIX)$(BINDIR)/hydra-wizard.sh $(DESTDIR)$(PREFIX)$(BINDIR)/dpl4hydra.sh
+	-rm -f $(DESTDIR)$(PREFIX)$(DATADIR)/dpl4hydra_full.csv $(DESTDIR)$(PREFIX)$(DATADIR)/dpl4hydra_local.csv
+	-rm -f $(DESTDIR)$(PREFIX)$(MANDIR)/hydra.1 $(DESTDIR)$(PREFIX)$(MANDIR)/xhydra.1 $(DESTDIR)$(PREFIX)$(MANDIR)/pw-inspector.1
+	-rm -f $(DESTDIR)$(PREFIX)$(PIXDIR)/xhydra.png
+	-rm -f $(DESTDIR)$(PREFIX)$(APPDIR)/xhydra.desktop
diff --git a/Makefile.orig b/Makefile.orig
index 372e67e..0fc0d2e 100644
--- a/Makefile.orig
+++ b/Makefile.orig
@@ -3,3 +3,6 @@ all:
 
 clean:
 	cp -f Makefile.orig Makefile
+
+uninstall:
+	@echo Error: you must run "./configure" first