diff --git a/Modules/CPack.STGZ_Header.sh.in b/Modules/CPack.STGZ_Header.sh.in
index dee576f..cbec28a 100755
--- a/Modules/CPack.STGZ_Header.sh.in
+++ b/Modules/CPack.STGZ_Header.sh.in
@@ -8,8 +8,8 @@ Usage: $0 [options]
 Options: [defaults in brackets after descriptions]
   --help            print this message
   --prefix=dir      directory in which to install
-  --include-subdir  include the @CPACK_PACKAGE_FILE_NAME@ subdirectory
-  --exclude-subdir  exclude the @CPACK_PACKAGE_FILE_NAME@ subdirectory
+  --include-subdir  include the @CPACK_PACKAGE_INSTALL_DIRECTORY@ subdirectory
+  --exclude-subdir  exclude the @CPACK_PACKAGE_INSTALL_DIRECTORY@ subdirectory
 EOF
   exit 1
 }
@@ -98,8 +98,8 @@ ____cpack__here_doc____
   if [ "x${cpack_include_subdir}x" = "xx" ]
   then
     echo "By default the @CPACK_PACKAGE_NAME@ will be installed in:"
-    echo "  \"${toplevel}/@CPACK_PACKAGE_FILE_NAME@\""
-    echo "Do you want to include the subdirectory @CPACK_PACKAGE_FILE_NAME@?"
+    echo "  \"${toplevel}/@CPACK_PACKAGE_INSTALL_DIRECTORY@\""
+    echo "Do you want to include the subdirectory @CPACK_PACKAGE_INSTALL_DIRECTORY@?"
     echo "Saying no will install in: \"${toplevel}\" [Yn]: "
     read line leftover
     cpack_include_subdir=TRUE
@@ -112,7 +112,7 @@ fi
 
 if [ "x${cpack_include_subdir}x" = "xTRUEx" ]
 then
-  toplevel="${toplevel}/@CPACK_PACKAGE_FILE_NAME@"
+  toplevel="${toplevel}/@CPACK_PACKAGE_INSTALL_DIRECTORY@"
   mkdir -p "${toplevel}"
 fi
 echo
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 083279f..a4b3eec 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -84,14 +84,15 @@ int cmCPackGenerator::PrepareNames()
                   "CPACK_PACKAGE_FILE_NAME not specified" << std::endl);
     return 0;
     }
-  std::string outName = pfname; 
-  tempDirectory += "/" + outName;
+  std::string instDir = this->GetOption("CPACK_PACKAGE_INSTALL_DIRECTORY");
+  tempDirectory += "/" + instDir;
   if(!this->GetOutputExtension())
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
                   "No output extension specified" << std::endl);
     return 0;
     }
+  std::string outName = pfname;
   outName += this->GetOutputExtension();
   const char* pdir = this->GetOption("CPACK_PACKAGE_DIRECTORY");
   if(!pdir)