diff --git a/F-Droid/res/layout/about.xml b/F-Droid/res/layout/about.xml
index 6a55dc9d2..3d3d49a18 100644
--- a/F-Droid/res/layout/about.xml
+++ b/F-Droid/res/layout/about.xml
@@ -1,101 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="24dp"
-    android:paddingStart="24dp"
-    android:paddingRight="24dp"
-    android:paddingEnd="24dp"
-    android:paddingTop="20dp"
-    android:baselineAligned="false"
-    android:orientation="vertical">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
+        android:paddingTop="4dp"
+        android:orientation="vertical">
 
         <TextView
             android:text="@string/about_version"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView android:id="@+id/version"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
+            style="@style/CaptionText" />
+        <TextView
+            android:id="@+id/version"
+            android:text="@string/unknown"
+            style="@style/BodyText" />
 
         <TextView
             android:text="@string/about_site"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
+            style="@style/CaptionText" />
         <TextView
             android:text="@string/site_link"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
             android:autoLink="web"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
-
-        <TextView
-            android:text="@string/about_source"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:text="@string/source_link"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
-            android:autoLink="web"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
+            style="@style/BodyText" />
 
         <TextView
             android:text="@string/about_mail"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
+            style="@style/CaptionText" />
         <TextView
             android:text="@string/team_email"
-            android:paddingLeft="8sp"
-            android:paddingStart="8sp"
             android:autoLink="email"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            style="@style/BodyText" />
+
+        <TextView
+            android:text="@string/about_source"
+            style="@style/CaptionText" />
+        <TextView
+            android:text="@string/source_link"
+            android:autoLink="web"
+            style="@style/BodyText" />
+
+        <TextView
+            android:text="@string/about_license"
+            style="@style/CaptionText" />
+        <TextView
+            android:text="@string/license_gplv3_later"
+            style="@style/BodyText" />
 
     </LinearLayout>
 
-    <TextView
-        android:text="@string/about_desc"
-        android:paddingTop="12dp"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-</LinearLayout>
+</ScrollView>
diff --git a/F-Droid/res/values/donottranslate.xml b/F-Droid/res/values/donottranslate.xml
index 9a9e0c51c..4830e10f0 100644
--- a/F-Droid/res/values/donottranslate.xml
+++ b/F-Droid/res/values/donottranslate.xml
@@ -4,6 +4,7 @@
     <string name="site_link">https://f-droid.org</string>
     <string name="source_link">https://gitlab.com/fdroid/fdroidclient</string>
     <string name="team_email">team@f-droid.org</string>
+    <string name="license_gplv3_later">GNU General Public License version\u00A03 or later</string>
 
     <string name="https">https://</string>
 
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index d7a9a57f4..e37d5e5ee 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -47,12 +47,11 @@
     <string name="no_such_app">No such app found.</string>
 
     <string name="about_title">About F-Droid</string>
-    <string name="about_version">Version:</string>
-    <string name="about_site">Website:</string>
-    <string name="about_source">Source:</string>
-    <string name="about_mail">E-Mail:</string>
-    <string name="about_desc">Originally based on Aptoide.\nReleased under the
-        GNU GPLv3 license.</string>
+    <string name="about_version">Version</string>
+    <string name="about_site">Website</string>
+    <string name="about_source">Source code</string>
+    <string name="about_mail">Email</string>
+    <string name="about_license">License</string>
 
     <string name="app_incompatible">Incompatible</string>
     <string name="app_installed">Installed</string>
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index 84dcc8197..d5eda5c4b 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -289,10 +289,9 @@ public class FDroid extends ActionBarActivity {
                 View view = LayoutInflater.from(this).inflate(R.layout.about, null);
 
                 String versionName = Utils.getVersionName(this);
-                if (versionName == null) {
-                    versionName = getString(R.string.unknown);
+                if (versionName != null) {
+                    ((TextView) view.findViewById(R.id.version)).setText(versionName);
                 }
-                ((TextView) view.findViewById(R.id.version)).setText(versionName);
 
                 AlertDialog alrt = new AlertDialog.Builder(this).setView(view).create();
                 alrt.setTitle(R.string.about_title);