diff --git a/metadata/de.ub0r.android.otpdroid.txt b/metadata/de.ub0r.android.otpdroid.txt
index 69d2f5fd63..d260c760be 100644
--- a/metadata/de.ub0r.android.otpdroid.txt
+++ b/metadata/de.ub0r.android.otpdroid.txt
@@ -1,5 +1,6 @@
+AntiFeatures:UpstreamNonFree
 Categories:Security
-License:Free Beer License
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/felixb/otpdroid
 Issue Tracker:https://github.com/felixb/otpdroid/issues
@@ -7,6 +8,8 @@ Issue Tracker:https://github.com/felixb/otpdroid/issues
 Auto Name:OTPdroid
 Summary:OTP generator
 Description:
+'''This app has pending licensing issues'''
+
 An One Time Password (rfc2289) implementation for the Android: a fork of
 [http://android.f00d.nl/opiekey opiekey].
 
@@ -27,10 +30,16 @@ Build:2.1,157
         echo "android.library.reference.2=$$ub0rlib$$" >> project.properties
 
 Maintainer Notes:
-This is not Beerware license, see
+The app includes GPL-3.0 files as well as "BeerLicense". The latter one should
+not to be confused with the "Beerware License". The license text is shown at
 https://github.com/felixb/otpdroid/blob/HEAD/src/de/ub0r/android/otpdroid/BeerLicense.java
+and includes a non-free part:
+
+"If you redistribute this piece of software, you are not allowed to charge money for this
+piece of software itself."
 .
 
+Archive Policy:0 versions
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.1