diff --git a/apps.json b/apps.json
index 5507a76c9..78d3574ea 100644
--- a/apps.json
+++ b/apps.json
@@ -623,5 +623,16 @@
       {"name":"-blobclk","url":"clock-blob.js"},
       {"name":"*blobclk","url":"clock-blob-icon.js","evaluate":true}
     ]
+  },
+  { "id": "berlinc",
+    "name": "Berlin Clock",
+    "icon": "app.png",
+    "description": "Berlin Clock",
+    "tags": "",
+    "storage": [
+      {"name":"+berlinc","url":"berlin-clock.json"},
+      {"name":"-berlinc","url":"berlin-clock.js"},
+      {"name":"*berlinc","url":"berlin-clock-icon.js","evaluate":true}
+    ]
   }
 ]
diff --git a/apps/berlinc/add_to_apps.json b/apps/berlinc/add_to_apps.json
index 8e9815796..4c92880a9 100644
--- a/apps/berlinc/add_to_apps.json
+++ b/apps/berlinc/add_to_apps.json
@@ -1,12 +1,12 @@
 // Create an entry in apps.json as follows:
 { "id": "berlinc",
   "name": "Berlin Clock",
-  "icon": "app.png",
+  "icon": "berlin-clock.png",
   "description": "Berlin Clock",
   "tags": "",
   "storage": [
-    {"name":"+berlinc","url":"app.json"},
-    {"name":"-berlinc","url":"app.js"},
-    {"name":"*berlinc","url":"app-icon.js","evaluate":true}
+    {"name":"+berlinc","url":"berlin-clock.json"},
+    {"name":"-berlinc","url":"berlin-clock.js"},
+    {"name":"*berlinc","url":"berlin-clock-icon.js","evaluate":true}
   ]
 }
diff --git a/apps/berlinc/berlin-clock.js b/apps/berlinc/berlin-clock.js
index 8c86ac5fc..875ae805e 100644
--- a/apps/berlinc/berlin-clock.js
+++ b/apps/berlinc/berlin-clock.js
@@ -9,9 +9,9 @@
 
     function drawBerlinClock() {
         var now = new Date();
-        rowlights[0] = now.getHours() / 5;
+        rowlights[0] = Math.floor(now.getHours() / 5);
         rowlights[1] = now.getHours() % 5;
-        rowlights[2] = now.getMinutes() / 5;
+        rowlights[2] = Math.floor(now.getMinutes() / 5);
         rowlights[3] = now.getMinutes() % 5;
     
         g.clear();