diff --git a/CHANGES b/CHANGES
index ac9e4a44..52fb69c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ lm_sensors CHANGES file
            Missing sysfs busses and classes are not errors
   Makefile: Don't grep autoconf.h on user-space targets
             Fix depmod on non-running kernel version
+            Remove empty include directories on make user_uninstall
   Module i2c-ali1535: Drop redundant semaphore (2.6 backport)
   Module i2c-amd756-s4882: Improve static semaphore initialization
                            (2.6 backport)
diff --git a/kernel/include/Module.mk b/kernel/include/Module.mk
index 4c5ba338..e9702d0e 100644
--- a/kernel/include/Module.mk
+++ b/kernel/include/Module.mk
@@ -48,6 +48,8 @@ user_install :: install-all-kernel-include
 
 user_uninstall::
 	$(RM) $(REMOVEKERNELINC)
+# Remove directory if empty, ignore failure
+	$(RMDIR) $(DESTDIR)$(SYSINCLUDEDIR) 2> /dev/null || true
 
 clean-all-kernel-include:
 	$(RM) $(KERNELINCLUDEDIR)/*.h.install $(KERNELINCLUDEDIR)/sensors.h $(KERNELINCLUDEDIR)/sensors.hd
diff --git a/lib/Module.mk b/lib/Module.mk
index e0879ce3..3b2b0344 100644
--- a/lib/Module.mk
+++ b/lib/Module.mk
@@ -160,6 +160,8 @@ user_install :: install-lib
 user_uninstall::
 	$(RM) $(REMOVELIBST) $(REMOVELIBSH) $(REMOVELNSO) $(REMOVELNBS) 
 	$(RM) $(REMOVELIBHF) $(REMOVEMAN3) $(REMOVEMAN5)
+# Remove directory if empty, ignore failure
+	$(RMDIR) $(DESTDIR)$(LIBINCLUDEDIR) 2> /dev/null || true
 
 clean-lib:
 	$(RM) $(LIB_DIR)/*.ld $(LIB_DIR)/*.ad