diff --git a/bin/dib-lint b/bin/dib-lint
index a8c10d4d..a34b8330 100755
--- a/bin/dib-lint
+++ b/bin/dib-lint
@@ -156,11 +156,15 @@ for i in $(find elements -type f   \
         fi
     fi
 
-    # check that environment files don't "set -x"
+    # check that environment files don't "set -x" and they have no executable
+    # bits set
     if [[ "$i" =~ (environment.d) ]]; then
         if grep -q "set -x" $i; then
             error "Environment file $i should not set tracing"
         fi
+        if [[ -x $i ]]; then
+            error "Environment file $i should not be marked as executable"
+        fi
     fi
 
     # check that sudo calls in phases run outside the chroot look
diff --git a/elements/centos/environment.d/00-bootloader.bash b/elements/centos/environment.d/00-bootloader.bash
old mode 100755
new mode 100644
diff --git a/elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash b/elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash
old mode 100755
new mode 100644
diff --git a/elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash b/elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash
old mode 100755
new mode 100644
diff --git a/elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable b/elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable
old mode 100755
new mode 100644
diff --git a/elements/devuser/environment.d/50-devuser b/elements/devuser/environment.d/50-devuser
old mode 100755
new mode 100644
diff --git a/elements/dynamic-login/init-scripts/upstart/dynamic-login.conf b/elements/dynamic-login/init-scripts/upstart/dynamic-login.conf
old mode 100755
new mode 100644
diff --git a/elements/gentoo/environment.d/00-gentoo-envars.bash b/elements/gentoo/environment.d/00-gentoo-envars.bash
old mode 100755
new mode 100644
diff --git a/elements/manifests/environment.d/14-manifests b/elements/manifests/environment.d/14-manifests
old mode 100755
new mode 100644
diff --git a/elements/pip-cache/environment.d/10-pip-cache b/elements/pip-cache/environment.d/10-pip-cache
old mode 100755
new mode 100644
diff --git a/elements/ramdisk-base/extra-data.d/scripts/d/init-func b/elements/ramdisk-base/extra-data.d/scripts/d/init-func
old mode 100755
new mode 100644
diff --git a/elements/redhat-common/environment.d/50-redhat-common b/elements/redhat-common/environment.d/50-redhat-common
old mode 100755
new mode 100644