diff --git a/CMakeLists.txt b/CMakeLists.txt
index d898674205ebf6f18c5560a52a7ce99dcacf80f5..05af9b0982adc8e881e8e97f26442502297625ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,9 +36,27 @@ if(PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
     set(WITH_GUI OFF)
 endif( )
 
+# On debian or ubuntu, --install-layout=deb needs to be passed.
+if(UNIX AND NOT APPLE)
+    find_program(LSB_RELEASE lsb_release)
+    if(LSB_RELEASE)
+        execute_process(COMMAND ${LSB_RELEASE} -is
+            OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+        if(${LSB_RELEASE_ID_SHORT} STREQUAL "Ubuntu" 
+                OR ${LSB_RELEASE_ID_SHORT} STREQUAL "Debian" )
+            message(STATUS "Debian based LINUX: ${LSB_RELEASE_ID_SHORT}" )
+            set(CMAKE_PYMOOSE_ARGS "-DDISTUTILS_EXTRA_ARGS=\"--install-layout=deb\"" )
+        endif( )
+    endif( )
+endif( )
+
+
+
 add_custom_target(moose ALL)
 
-## intialize paths
+
 set(PYMOOSE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/moose-core")
 set(PYMOOSE_BUILD_DIR ${CMAKE_BINARY_DIR}/__moose-core_build)
 set(PYMOOSE_INSTALL_DIR ${CMAKE_BINARY_DIR}/__moose-core_install)
@@ -131,7 +149,7 @@ if(WITH_GUI)
         ${CMAKE_INSTALL_PREFIX}/lib/moose/gui
         COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_INSTALL_PREFIX}/bin/moose
         )
-    add_dependencies( uninstall __uninstall_moose-gui__ )
+    #add_dependencies( uninstall __uninstall_moose-gui__ )
 endif()
 
 ################################################################################
diff --git a/build_moose-core.sh.in b/build_moose-core.sh.in
index 84057cf781c49906e09bf59199a5f04ac132c7c2..57d0e6828fb004cba2a6da2433926fce94a2b466 100755
--- a/build_moose-core.sh.in
+++ b/build_moose-core.sh.in
@@ -3,13 +3,23 @@ set -x
 set -e
 
 # NOTICE: This file is parsed by cmake to create a shell script. Not all syntax
-# will play well with cmake. CMAKE replaces @FOO@ and ${FOO} with cmake variable
+# will play well with cmake. 
+#
+# CMAKE replaces @FOO@ and ${FOO} with cmake variable
 # values.
 
 if [ -z "$MAKE" ]; then
     MAKE=make
 fi
 
+CMAKE_PYMOOSE_ARGS=''
+SITE_PACKAGE=`@PYTHON_EXECUTABLE@ -c \
+    "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+echo $SITE_PACKAGE
+
+
+# If we are on DEBIAN/UBUNTU, pass --install-layout=deb to moose-core.
+
 echo "Building MOOSE"
 (
     export GSL_ROOT_DIR=@GSL_ROOT_DIR@
diff --git a/cmake/build_moose-core.sh.in b/cmake/build_moose-core.sh.in
index 43d2ab2b31abef6a3f7c5b1e630efefa42cbcedf..269e28e5658347987d455beb4cc070a5cb64ff17 100755
--- a/cmake/build_moose-core.sh.in
+++ b/cmake/build_moose-core.sh.in
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+
 set -x 
 set -e