diff --git a/ChangeLog b/ChangeLog
index bbc227be4..7d87328dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-02  Badlop  <badlop@process-one.net>
+
+	* src/Makefile.in: New options make uninstall and
+	uninstall-all (EJAB-293)
+
 2007-12-01  Mickael Remond  <mremond@process-one.net>
 
 	* doc/Makefile: echo seems to interpret \n and \v under MacOSX
diff --git a/src/Makefile.in b/src/Makefile.in
index b327ecb54..23dfa2e47 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -107,6 +107,20 @@ install: all
 	install -m 755 ejabberdctl.example $(SBINDIR)/ejabberdctl
 	install -d $(LOGDIR)
 
+uninstall: uninstall-binary
+
+uninstall-binary:
+	rm -rf $(BEAMDIR)
+	rm -rf $(SODIR)
+	rm -rf $(MSGSDIR)
+	rm -rf $(PRIVDIR)
+	rm -rf $(SBINDIR)/ejabberdctl
+
+uninstall-all: uninstall-binary
+	rm -rf $(ETCDIR)
+	rm -rf $(LOGDIR)
+	rm -rf $(EJABBERDDIR)
+
 clean: clean-recursive clean-local
 
 clean-local: