diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e1c44ea
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "calendar"]
+	path = calendar
+	url = https://github.com/deficient/calendar
diff --git a/calendar b/calendar
new file mode 160000
index 0000000..00860a3
--- /dev/null
+++ b/calendar
@@ -0,0 +1 @@
+Subproject commit 00860a3e21989121550f1eabbaeed84b88a1367f
diff --git a/rc.lua b/rc.lua
index ba948df..ffc7f6f 100644
--- a/rc.lua
+++ b/rc.lua
@@ -19,6 +19,7 @@ local cpu_widget = require("awesome-wm-widgets.cpu-widget.cpu-widget")
 local battery_widget = require("awesome-wm-widgets.battery-widget.battery")
 local ram_widget = require("awesome-wm-widgets.ram-widget.ram-widget")
 local email_widget = require("awesome-wm-widgets.email-widget.email")
+local calendar = require("calendar.calendar")
 
 -- Custom imports
 local options = require("options")
@@ -208,7 +209,6 @@ local tasklist_buttons = awful.util.table.join(
                                               awful.client.focus.byidx(-1)
                                           end))
 
-local calendar = require('calendar')
 local launchbar = require('launchbar')
 local music = require('music')
 -- local background = require('background_widget')
@@ -256,6 +256,9 @@ awful.screen.connect_for_each_screen(function(s)
     -- Create the wibox
     s.mywibox = awful.wibar({ position = "top", screen = s })
 
+    s.textclock = awful.widget.textclock(" %a %d %b  %H:%M ")
+    calendar({}):attach(s.textclock)
+
     -- Add widgets to the wibox
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
@@ -290,7 +293,7 @@ awful.screen.connect_for_each_screen(function(s)
             delimiter,
             mykeyboardlayout,
             wibox.widget.systray(),
-            textclock_widget,
+            s.textclock,
             s.mylayoutbox,
         },
     }
@@ -735,4 +738,8 @@ end)
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
+-- load the widget code
+
+-- attach it as popup to your text clock widget:
+
 -- }}}