diff --git a/README b/README
index bfcb462e..213f8fae 100644
--- a/README
+++ b/README
@@ -31,6 +31,13 @@ The license for the application.
 
 Common values: GPLv2, GPLv2+, GPLv3, Apache2, MIT, BSD
 
+==Name==
+
+The name of the application. Normally, this field should not be present since the
+application's correct name is retrieved from the APK file. However, in a situation
+where an APK contains a bad or missing application name, it can be overridden
+using this.
+
 ==Web Site==
 
 The URL for the application's web site.
diff --git a/metadata.py b/metadata.py
index a62f8360..e8d6feef 100644
--- a/metadata.py
+++ b/metadata.py
@@ -28,6 +28,7 @@ def read_metadata():
         thisinfo['id'] = metafile[9:-4]
         print "Reading metadata for " + thisinfo['id']
         thisinfo['description'] = ''
+        thisinfo['name'] = None
         thisinfo['summary'] = ''
         thisinfo['license'] = 'Unknown'
         thisinfo['web'] = ''
@@ -56,6 +57,8 @@ def read_metadata():
                     value = line[index+1:]
                     if field == 'Description':
                         mode = 1
+                    elif field == 'Name':
+                        thisinfo['name'] = value
                     elif field == 'Summary':
                         thisinfo['summary'] = value
                     elif field == 'Source Code':
diff --git a/metadata/de.joergjahnke.c64.android.txt b/metadata/de.joergjahnke.c64.android.txt
new file mode 100644
index 00000000..ec74d89b
--- /dev/null
+++ b/metadata/de.joergjahnke.c64.android.txt
@@ -0,0 +1,9 @@
+License:GPL
+Name:Mobile C64
+Web Site:http://jmec64.sourceforge.net/
+Source Code:http://sourceforge.net/projects/jmec64/develop
+Issue Tracker:http://sourceforge.net/tracker/?group_id=171310
+Summary:Commodore 64 Emulator
+Description:
+A Commodore 64 (C64) emulator.
+.
diff --git a/update.py b/update.py
index 61519e2d..b9e0c1a3 100644
--- a/update.py
+++ b/update.py
@@ -152,11 +152,13 @@ for app in apps:
                 bestapk = apk
 
     if bestver == 0:
-        app['name'] = app['id']
+        if app['name'] is None:
+            app['name'] = app['id']
         app['icon'] = ''
         print "WARNING: Application " + app['id'] + " has no packages"
     else:
-        app['name'] = bestapk['name']
+        if app['name'] is None:
+            app['name'] = bestapk['name']
         app['icon'] = bestapk['icon']
 
 # Generate warnings for apk's with no metadata (or create skeleton