diff --git a/awesome-freedesktop-git.rockspec b/awesome-freedesktop-scm-1.rockspec
similarity index 92%
rename from awesome-freedesktop-git.rockspec
rename to awesome-freedesktop-scm-1.rockspec
index 1dd933f..36cab17 100644
--- a/awesome-freedesktop-git.rockspec
+++ b/awesome-freedesktop-scm-1.rockspec
@@ -1,8 +1,8 @@
 package = "awesome-freedesktop"
-version = "git"
+version = "scm-1"
 source = {
    url = "https://github.com/lcpz/awesome-freedesktop",
-   tag = "git"
+   tag = "scm-1`"
 }
 description = {
    summary = "Freedesktop.org menu and desktop icons support for Awesome WM",
diff --git a/menu.lua b/menu.lua
index 7281692..14a4338 100644
--- a/menu.lua
+++ b/menu.lua
@@ -58,8 +58,8 @@ function menu.build(args)
     local icon_size  = args.icon_size
     local before     = args.before or {}
     local after      = args.after or {}
-    local sub_menu   = args.sub_menu or false
     local skip_items = args.skip_items or {}
+    local sub_menu   = args.sub_menu or false
 
     local result     = {}
     local _menu      = awful_menu({ items = before })
@@ -99,10 +99,12 @@ function menu.build(args)
         -- Sort categories alphabetically also
         table.sort(result, function(a, b) return string.byte(a[1]) < string.byte(b[1]) end)
 
+        -- Add menu item to hold the generated menu
+        if sub_menu then
+            result = {{sub_menu, result}}
+        end
+
         -- Add items to menu
-	if sub_menu then
-	    result = {{sub_menu, result}}
-	end
         for _, v in pairs(result) do _menu:add(v) end
         for _, v in pairs(after)  do _menu:add(v) end
     end)
diff --git a/screenshot.png b/screenshot.png
index 2cf88e5..bf254ac 100644
Binary files a/screenshot.png and b/screenshot.png differ