diff --git a/debian/changelog b/debian/changelog
index 13ab99802..b3b3834ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.35-1~experimental.3) UNRELEASED; urgency=low
+
+  [ Ritesh Raj Sarraf ]
+  * Add .gnu_debuglink information into kernel modules (Closes: #555549)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 18 Aug 2010 02:45:21 +0100
+
 linux-2.6 (2.6.35-1~experimental.2) experimental; urgency=low
 
   * images: Nuke modules.devname on removal. (closes: #590607)
diff --git a/debian/rules.real b/debian/rules.real
index 0d938f3a3..ca9497673 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -345,6 +345,11 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain:
 	  DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)'
 ifeq ($(MODULES),True)
 	+$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) INSTALL_MOD_STRIP=1
+ifeq ($(DEBUG),True)
+	find $(PACKAGE_DIR) -name '*.ko' | sed 's|$(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/kernel/||' | while read module ; do \
+	  objcopy --add-gnu-debuglink=$(DIR)/$$module $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/kernel/$$module; \
+	done
+endif
 	cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
 	cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
 	rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}