diff --git a/CHANGES b/CHANGES
index df8df46b..3254933b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ lm_sensors CHANGES file
 SVN-HEAD
   Library: Don't choke on unrecognized devices, part 2
            Parse the configuration file in C locale (#2312)
+  Makefile: Fallback to simple depmod if System.map can't be found
   Module asb100: Remove some dead code (2.6 backport)
   Module i2c-amd756: Fix functionality flags (2.6 backport)
   Module i2c-amd756-s4882: Fix an error path (2.6 backport)
diff --git a/Makefile b/Makefile
index 9fd4534a..279650cd 100644
--- a/Makefile
+++ b/Makefile
@@ -319,8 +319,12 @@ user_install::
 all :: user
 install :: all user_install
 ifeq ($(DESTDIR),)
-	-if [ -r $(MODPREF)/build/System.map -a -x /sbin/depmod ] ; then \
-	  /sbin/depmod -a -F $(MODPREF)/build/System.map $(KERNELVERSION) ; \
+	-if [ -x /sbin/depmod ] ; then \
+	  if [ -r $(MODPREF)/build/System.map ] ; then \
+	    /sbin/depmod -a -F $(MODPREF)/build/System.map $(KERNELVERSION) ; \
+	  elif [ "$(KERNELVERSION)" = "`uname -r`"  ] ; then \
+	    /sbin/depmod -a ; \
+	  fi \
 	fi
 else
 	@echo "*** This is a \`staged' install using \"$(DESTDIR)\" as prefix."