diff --git a/package/gtk2-themes/Config.in b/package/gtk2-themes/Config.in
index 351b602c05..ac212b898b 100644
--- a/package/gtk2-themes/Config.in
+++ b/package/gtk2-themes/Config.in
@@ -1,7 +1,6 @@
 menu "GTK Themes"
 depends on BR2_PACKAGE_LIBGTK2
 
-config BR2_PACKAGE_GTK2_THEME_HICOLOR
-	bool "hicolor (default theme)"
+source "package/gtk2-themes/gtk2-theme-hicolor/Config.in"
 
 endmenu
diff --git a/package/gtk2-themes/gtk2-theme-hicolor/Config.in b/package/gtk2-themes/gtk2-theme-hicolor/Config.in
new file mode 100644
index 0000000000..144f1d8656
--- /dev/null
+++ b/package/gtk2-themes/gtk2-theme-hicolor/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_GTK2_THEME_HICOLOR
+	bool "hicolor (default theme)"
diff --git a/package/gtk2-themes/gtk2_themes.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
similarity index 90%
rename from package/gtk2-themes/gtk2_themes.mk
rename to package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index 8dc8af4873..ac2eaef824 100644
--- a/package/gtk2-themes/gtk2_themes.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -15,4 +15,4 @@ GTK2_THEME_HICOLOR_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NA
 
 GTK2_THEME_HICOLOR_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS,package,gtk2_theme_hicolor))
+$(eval $(call AUTOTARGETS,package/gtk2-themes,gtk2-theme-hicolor))
diff --git a/package/gtk2-themes/gtk2-themes.mk b/package/gtk2-themes/gtk2-themes.mk
new file mode 100644
index 0000000000..6f31c6da98
--- /dev/null
+++ b/package/gtk2-themes/gtk2-themes.mk
@@ -0,0 +1 @@
+include package/gtk2-themes/*/*.mk