diff --git a/debian/changelog b/debian/changelog
index 403ab93c5..66767fa93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ linux-2.6 (2.6.32-13) UNRELEASED; urgency=low
   * backport MIPS FPU emulator: allow Cause bits of FCSR to be writeable
     by ctc1. (closes: #580602).
 
+  [ Bastian Blank ]
+  * Fix symlinks in several packages.
+
  -- Frederik Schüler <fs@debian.org>  Wed, 05 May 2010 17:54:01 +0200
 
 linux-2.6 (2.6.32-12) unstable; urgency=low
diff --git a/debian/rules.real b/debian/rules.real
index 3f42de14c..a96579f07 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -217,7 +217,9 @@ install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET
 	| \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(DIR)'
 
-	ln -s /usr/lib/$(PACKAGE_NAME_KBUILD)/{Kbuild,scripts} $(DIR)
+	dh_link \
+		/usr/lib/$(PACKAGE_NAME_KBUILD)/Kbuild $(BASE_DIR)/Kbuild \
+		/usr/lib/$(PACKAGE_NAME_KBUILD)/scripts $(BASE_DIR)/scripts
 
 	+$(MAKE_SELF) install-base
 
@@ -262,7 +264,7 @@ endif
 	@echo '$$(cmd) %/: all' >> $(DIR)/Makefile
 	@echo '	@:' >> $(DIR)/Makefile
 
-	ln -s /usr/lib/$(PACKAGE_NAME_KBUILD)/scripts $(DIR)
+	dh_link /usr/lib/$(PACKAGE_NAME_KBUILD)/scripts $(BASE_DIR)/scripts
 
 	mkdir -p $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)
 	ln -s /usr/src/$(PACKAGE_NAME) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build