diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake
index c27a51acd..8650a1f85 100644
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -4,6 +4,4 @@ set( APPLICATION_EXECUTABLE "owncloud"        )
 set( APPLICATION_DOMAIN     "owncloud.org"    )
 set( APPLICATION_VENDOR     "ownCloud.org"    )
 set( THEME_CLASS            "ownCloudTheme"   )
-SET( APPLICATION_REV_DOMAIN "org.owncloud.desktopclient" )
-SET( APPLICATION_LICENSE    "COPYING" )
-
+set( APPLICATION_REV_DOMAIN "org.owncloud.desktopclient" )
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 73a22f803..e85bc98a3 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -13,7 +13,9 @@
 ;-----------------------------------------------------------------------------
 ; Some installer script options (comment-out options not required)
 ;-----------------------------------------------------------------------------
-!define OPTION_LICENSE_AGREEMENT
+!if "@APPLICATION_LICENSE@" != ""
+  !define OPTION_LICENSE_AGREEMENT
+!endif
 !define OPTION_UAC_PLUGIN_ENHANCED
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP