diff --git a/app/src/gambas3/.src/Packager/FMakeInstall.class b/app/src/gambas3/.src/Packager/FMakeInstall.class
index 4d3c50779..701688ee4 100644
--- a/app/src/gambas3/.src/Packager/FMakeInstall.class
+++ b/app/src/gambas3/.src/Packager/FMakeInstall.class
@@ -128,7 +128,7 @@ Public Sub Form_Open()
 
   cmbCategories.List = Split(File.Load("install/categories"), "\n", "", True)
 
-  txtLicense.List = ["General Public License", "Freeware", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-Free License"]
+  'txtLicense.List = ["General Public License", "Freeware", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-Free License"]
   
   chkCreateDir.Value = Project.CreateEachDirectory
 
diff --git a/app/src/gambas3/.src/Packager/FMakeInstall.form b/app/src/gambas3/.src/Packager/FMakeInstall.form
index 5b5326cad..3d2abecd9 100644
--- a/app/src/gambas3/.src/Packager/FMakeInstall.form
+++ b/app/src/gambas3/.src/Packager/FMakeInstall.form
@@ -171,7 +171,7 @@
         MoveScaled(25,0,46,4)
         #Translate = False
         Expand = True
-        List = ["General Public License", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-free License"]
+        List = ["General Public License", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-free License", "General Public License V2 only", "Lesser General Public License V2 only", "General Public License V3", "Lesser General Public License V3", "General Public License V2 or any later version", "Lesser General Public License V2 or any later version"]
         Sorted = True
       }
     }
diff --git a/app/src/gambas3/.src/Packager/Package.module b/app/src/gambas3/.src/Packager/Package.module
index 2730f6404..4f2184b14 100644
--- a/app/src/gambas3/.src/Packager/Package.module
+++ b/app/src/gambas3/.src/Packager/Package.module
@@ -2316,7 +2316,7 @@ Private Sub MakeAutotoolsPackage((sSys) As String)
   File.Save(sBuildDir &/ "ChangeLog", ChangeLog)
   File.Save(sBuildDir &/ "AUTHORS", Project.Maintainer & " <" & Project.Address & ">")
   File.Save(sBuildDir &/ "README", Project.Description)
-  File.Save(sBuilddir &/ "COPYING", "This program is under : " & Project.License)
+  File.Save(sBuilddir &/ "COPYING", "This program is under: " & Project.License)
   File.Save(sBuilddir &/ "NEWS", "")
   
   hFile = Open sBuildDir &/ "configure.ac" For Create
@@ -2381,7 +2381,6 @@ Private Function MakeArchPackage(sSys As String)
   Dim sDependencies As String
   Dim sPkgDesc As String
   Dim sPackageName As String
-  Dim sLicence As String
   
   Inc Application.Busy
 
@@ -2411,7 +2410,7 @@ Private Function MakeArchPackage(sSys As String)
   sPkgTgz = $sName & "-" & $sVersion & ".tar.bz2"
   Project.MakeSourcePackageTo(sBuildDir &/ sPkgTgz)
 
-  File.Save(sBuilddir &/ "license.txt", "This program is under : " & Project.License)
+  File.Save(sBuilddir &/ "license.txt", "This program is under: " & Project.License)
   
   If Project.Type = Project.TYPE_NORMAL Then
 
@@ -2445,17 +2444,7 @@ Private Function MakeArchPackage(sSys As String)
     ' Other License(s)
     ' Non-free License
     
-    Select Case Package.Licence
-      
-      Case "General Public License"
-        sLicence = "GPL"
-        
-      Case Else
-        sLicence = "custom:" & Package.Licence
-      
-    End Select
-    
-    Print #hFile, "license=('" & sLicence & "')"
+    Print #hFile, "license=('custom:" & Project.License & "')"
     If Len(sDependencies) > 0 Then
       Print #hFile, "depends=(" & Left$(sDependencies, -1) & ")"
     Endif
@@ -2522,7 +2511,7 @@ Private Function MakeArchPackage(sSys As String)
 
     Print #hFile, GetExtraFilesDir(sSys, "  install -d ${pkgdir}&1");
     Print #hFile, GetExtraFiles(sSys, "  install -p ${srcdir}/${_realname}/.hidden/&1 ${pkgdir}&2/&1", "  cp -R --preserve=timestamp ${srcdir}/${_realname}/.hidden/&1 ${pkgdir}&2/&1");
-    Print #hFile, "  install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses" &/ sPackageName &/ "license.txt"
+    Print #hFile, "  install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses" &/ sPackageName &/ "LICENSE"
     Print #hFile, "}"
     
   Close #hFile
@@ -2581,7 +2570,7 @@ Private Function MakeArchSupportPackage((sSys) As String, sSupport As String, aC
 
   ' 2. Copy needed files 
   
-  File.Save(sBuilddir &/ "license.txt", "This program is under : " & Project.License)
+  File.Save(sBuilddir &/ "license.txt", "This program is under: " & Project.License)
   
   hFile = Open sBuildDir &/ "PKGBUILD" For Create
     Print #hFile, "# generated by the gambas3 ide"