diff --git a/configure.ac b/configure.ac
index 6209a846d6..4b337eea7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1342,11 +1342,11 @@ AC_CONFIG_FILES([
 
     contrib/Makefile
 
-    contrib/dist/linux/compile_debian_mlnx_example
-    contrib/dist/linux/debian/changelog
-    contrib/dist/linux/debian/rules
-    contrib/dist/linux/debian/control
-    contrib/dist/linux/debian/copyright:LICENSE
+    contrib/dist/mofed/compile_debian_mlnx_example
+    contrib/dist/mofed/debian/changelog
+    contrib/dist/mofed/debian/rules
+    contrib/dist/mofed/debian/control
+    contrib/dist/mofed/debian/copyright:LICENSE
 
     test/Makefile
     test/event/Makefile
@@ -1357,8 +1357,8 @@ AC_CONFIG_FILES([
     test/threads/Makefile
     test/util/Makefile
 ],[
-    chmod +x contrib/dist/linux/debian/rules
-    chmod +x contrib/dist/linux/compile_debian_mlnx_example
+    chmod +x contrib/dist/mofed/debian/rules
+    chmod +x contrib/dist/mofed/compile_debian_mlnx_example
     ])
 
 OPAL_CONFIG_FILES
diff --git a/contrib/dist/linux/compile_debian_mlnx_example.in b/contrib/dist/mofed/compile_debian_mlnx_example.in
similarity index 59%
rename from contrib/dist/linux/compile_debian_mlnx_example.in
rename to contrib/dist/mofed/compile_debian_mlnx_example.in
index ee81c26a7f..13cb14d51d 100644
--- a/contrib/dist/linux/compile_debian_mlnx_example.in
+++ b/contrib/dist/mofed/compile_debian_mlnx_example.in
@@ -1,3 +1,5 @@
+#!/bin/sh
+MYDIR=$(dirname $0)
 INSTALL_DIR=${INSTALL_DIR:-/usr/mpi/gcc}
 PREFIX=${INSTALL_DIR}/openmpi-@OMPI_MAJOR_VERSION@.@OMPI_MINOR_VERSION@.@OMPI_RELEASE_VERSION@
 
@@ -5,11 +7,15 @@ MXM_PATH=${MXM_PATH:-/opt/mellanox/mxm}
 FCA_PATH=${FCA_PATH:-/opt/mellanox/fca}
 KNEM_PATH=${KNEM_PATH:-/opt/knem-1.0.90mlnx2}
 
+if [ ! -f AUTHORS ]; then
+    echo Please run from ompi root folder
+    exit 1
+fi
+
 [ -d $MXM_PATH ] && WITH_MXM="--with-mxm=$MXM_PATH"
 [ -d $FCA_PATH ] && WITH_FCA="--with-fca=$FCA_PATH"
 [ -d $KNEM_PATH ] && WITH_KNEM="--with-knem=$KNEM_PATH"
 
-CONFIG_ARGS=${CONFIG_ARGS:-"--prefix=$PREFIX --libdir=$OMPI_PREFIX/lib64 --with-platform=contrib/platform/mellanox/optimized $WITH_MXM $WITH_FCA $WITH_KNEM"}
-export CONFIG_ARGS
-cp -a contrib/dist/linux/debian .
+export CONFIG_ARGS=${CONFIG_ARGS:-"--prefix=$PREFIX --libdir=$OMPI_PREFIX/lib64 --with-platform=contrib/platform/mellanox/optimized $WITH_MXM $WITH_FCA $WITH_KNEM"}
+cp -a ${MYDIR}/debian .
 dpkg-buildpackage -us -uc
diff --git a/contrib/dist/linux/debian/changelog.in b/contrib/dist/mofed/debian/changelog.in
similarity index 100%
rename from contrib/dist/linux/debian/changelog.in
rename to contrib/dist/mofed/debian/changelog.in
diff --git a/contrib/dist/linux/debian/compat b/contrib/dist/mofed/debian/compat
similarity index 100%
rename from contrib/dist/linux/debian/compat
rename to contrib/dist/mofed/debian/compat
diff --git a/contrib/dist/linux/debian/control.in b/contrib/dist/mofed/debian/control.in
similarity index 100%
rename from contrib/dist/linux/debian/control.in
rename to contrib/dist/mofed/debian/control.in
diff --git a/contrib/dist/linux/debian/rules.in b/contrib/dist/mofed/debian/rules.in
similarity index 100%
rename from contrib/dist/linux/debian/rules.in
rename to contrib/dist/mofed/debian/rules.in
diff --git a/contrib/dist/linux/debian/source/format b/contrib/dist/mofed/debian/source/format
similarity index 100%
rename from contrib/dist/linux/debian/source/format
rename to contrib/dist/mofed/debian/source/format