diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index 26da4cbda8fc43c76c71ab41dc2f5480d3621546..b7c19303429a4e3d5e2a5702577b2bcad0092872 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -249,7 +249,9 @@ else()
   include(External_otb)
 endif()
 
-if(GENERATE_PACKAGE)
+option(GENERATE_PACKAGE "Generate OTB package" ON)
+option(GENERATE_XDK "Generate XDK for OTB development" OFF)
+if(GENERATE_PACKAGE OR GENERATE_XDK)
   if(UNIX)
     add_subdirectory(Packaging)
   endif()
diff --git a/SuperBuild/Packaging/CMakeLists.txt b/SuperBuild/Packaging/CMakeLists.txt
index a3da1bab88b757b188c0b1d6e17096ed456a086e..3e5863808c2cd18aa40d18f767966bb4a1f31cbc 100644
--- a/SuperBuild/Packaging/CMakeLists.txt
+++ b/SuperBuild/Packaging/CMakeLists.txt
@@ -15,9 +15,6 @@ if(PROJECT_NAME STREQUAL "OTBPackaging")
   set(OUT_OF_SOURCE_BUILD TRUE)
 endif()
 
-option(GENERATE_PACKAGE "Generate OTB package" ON)
-option(GENERATE_XDK "Generate XDK for OTB development" OFF)
-
 if(NOT GENERATE_PACKAGE AND NOT GENERATE_XDK)
   #well. we don't have any businees here. Let's move on..
   return()