diff --git a/debian/changelog b/debian/changelog
index 697f7d39..92fdd4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,10 @@ llvm-toolchain-7 (1:7~+rc3-2) UNRELEASED; urgency=medium
   * Fix inverted logic in ifeq statement for POLLY_ENABLE
     and OPENMP_ENABLE (Closes: #908646)
 
- -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 12 Sep 2018 10:40:28 +0200
+  [ Gianfranco Costamagna ]
+  * Drop gnustep and gnustep-devel suggestions (Closes: #902847)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 12 Sep 2018 10:58:12 +0200
 
 llvm-toolchain-7 (1:7~+rc3-1) unstable; urgency=medium
 
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index f44e87eb..3d6dd352 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -3,7 +3,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/*.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/share/*.txt
-usr/lib/llvm-@LLVM_VERSION@/lib/cmake/polly/*.cmake
 
 #usr/lib/clang/@LLVM_VERSION_FULL@/lib             /usr/lib/clang/@LLVM_VERSION@/
 #usr/lib/clang/@LLVM_VERSION_FULL@/include/         /usr/include/clang/@LLVM_VERSION@/
diff --git a/debian/rules b/debian/rules
index 5fa570d9..4df30797 100755
--- a/debian/rules
+++ b/debian/rules
@@ -629,6 +629,9 @@ endif
 
 override_dh_install:
 #	cp $(TARGET_BUILD)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT)
+ifeq (${POLLY_ENABLE},yes)
+	dh_install -p libclang$(SONAME_EXT)-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
+endif
 	dh_install --fail-missing
 
 override_dh_installdeb: