diff --git a/catalog/fgaddon-catalog-ukmirror/catalog.config.xml b/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
index b5efa13..16cff16 100644
--- a/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
+++ b/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PropertyList>
-	<local-output>/home/fgaddon/output/Aircraft</local-output>
-  <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/</download-url>
-  <download-url n="1">http://ukmirror.flightgear.org/official/Aircraft/</download-url>
+	<local-output>/home/fgaddon/output/Aircraft-trunk</local-output>
+  <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/</download-url>
+  <download-url n="1">http://ukmirror.flightgear.org/official/Aircraft-trunk/</download-url>
 
-  <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/thumbnails</thumbnail-url>
-  <thumbnail-url n="1">http://ukmirror.flightgear.org/official/Aircraft/thumbnails</thumbnail-url>
+  <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/thumbnails</thumbnail-url>
+  <thumbnail-url n="1">http://ukmirror.flightgear.org/official/Aircraft-trunk/thumbnails</thumbnail-url>
 
   <scm>
     <type>svn</type>
diff --git a/catalog/fgaddon-catalog-ukmirror/template.xml b/catalog/fgaddon-catalog-ukmirror/template.xml
index b0babfc..94574af 100644
--- a/catalog/fgaddon-catalog-ukmirror/template.xml
+++ b/catalog/fgaddon-catalog-ukmirror/template.xml
@@ -4,12 +4,12 @@
 	  <version n="0">2019.*</version>
 	  <version n="1">2018.4.*</version>
 
-    <id>org.flightgear.fgaddon</id>
+    <id>org.flightgear.fgaddon.trunk</id>
     <license>GPL</license>
-    <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+    <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/catalog.xml</url>
     <name>FlightGear aircraft distribution from fgaddon</name>
     <description>This hangar provides aircraft officially supported and maintained by the FlightGear project, 
-    under a free-software license.</description>
+    under a free-software license. It tracks latest aircraft developments in the FGaddon repository.</description>
     <!-- <de>
       <description>Auf Deutsch</description>
     </de>
@@ -18,38 +18,36 @@
     </fr> -->
 
 
-<!-- be nice to older versions which only accept one version element per alternate -->
     <alternate-version>
-      <version>2018.1.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
-      <id>org.flightgear.fgaddon.stable_2018</id>
-    </alternate-version>
-    
-    <alternate-version>
-      <version>2018.2.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
-      <id>org.flightgear.fgaddon.stable_2018</id>
-    </alternate-version>
-	 <alternate-version>
       <version>2018.3.*</version>
       <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
       <id>org.flightgear.fgaddon.stable_2018</id>
     </alternate-version>
-
-
-
-    <alternate-version>
-      <version>2017.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-legacy/catalog.xml</url>
-      <id>org.flightgear.fgaddon.legacy</id>
-    </alternate-version>
-
+    
+  
     <!-- alternate version previously did not allow multiple version entries, so we
     duplicate the alternate version here -->
+    <alternate-version>
+      <version>2018.2.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+      <id>org.flightgear.fgaddon</id>
+    </alternate-version>
+	 <alternate-version>
+      <version>2018.1.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+      <id>org.flightgear.fgaddon</id>
+    </alternate-version>
+
+    <alternate-version>
+      <version>2017.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+      <id>org.flightgear.fgaddon</id>
+    </alternate-version>
+
     <alternate-version>
       <version>2016.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-legacy/catalog.xml</url>
-      <id>org.flightgear.fgaddon.legacy</id>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+      <id>org.flightgear.fgaddon</id>
     </alternate-version>
   </template>
 </PropertyList>
diff --git a/catalog/legacy-catalog/catalog.config.xml b/catalog/legacy-catalog/catalog.config.xml
index 2ab4095..a6344a8 100644
--- a/catalog/legacy-catalog/catalog.config.xml
+++ b/catalog/legacy-catalog/catalog.config.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Template catalog - copy and modify for your site as required-->
 <PropertyList>
-  <local-output>/home/fgaddon/output-legacy</local-output>
-  <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-legacy/</download-url>
-  <download-url n="1">http://ukmirror.flightgear.org/official/Aircraft-legacy/</download-url>
+  <local-output>/home/fgaddon/output/Aircraft</local-output>
+  <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/</download-url>
+  <download-url n="1">http://ukmirror.flightgear.org/official/Aircraft/</download-url>
 
-  <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-legacy/thumbnails</thumbnail-url>
-  <thumbnail-url n="1">http://ukmirror.flightgear.org/official/Aircraft-legacy/thumbnails</thumbnail-url>
+  <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/thumbnails</thumbnail-url>
+  <thumbnail-url n="1">http://ukmirror.flightgear.org/official/Aircraft/thumbnails</thumbnail-url>
 
   <scm>
     <type>svn</type>
diff --git a/catalog/legacy-catalog/template.xml b/catalog/legacy-catalog/template.xml
index 69f7a4e..b036a1f 100644
--- a/catalog/legacy-catalog/template.xml
+++ b/catalog/legacy-catalog/template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Template catalog - copy and modify for your site as required-->
+
 <PropertyList>
   <template>
     <version n="0">3.4.*</version>
@@ -8,22 +8,31 @@
     <version n="3">3.7.*</version>
     <version n="5">2016.*.*</version>
     <version n="6">2017.*.*</version>
-    <id>org.flightgear.fgaddon.legacy</id>
+
+    <!-- legacy is also used by these version since they don't know how to
+     handle migrating to another ID -->
+    <version n="7">2018.1.*</version>
+    <version n="8">2018.2.*</version>
+
+    <!-- the legacy catalog has to have this ID, becuase this is what older FG
+    clients expect -->
+    <id>org.flightgear.fgaddon</id>
     <license>GPL</license>
-    <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-legacy/catalog.xml</url>
+    <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
     <name>FlightGear aircraft(legacy support)</name>
     <description>This hangar provides aircraft officially supported and maintained by the 
     FlightGear project, under a free-software license. Aircraft are intended for
-    use with FlightGear versions from 2017 and older.</description>
+    use with FlightGear versions 2018.2 and older.</description>
 
     <alternate-version>
       <version>2019.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
+      <version>2018.4.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/catalog.xml</url>
+      <id>org.flightgear.fgaddon.trunk</id>
     </alternate-version>
 
     <alternate-version>
-      <version>2018.*</version>
+      <version>2018.3.*</version>
       <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
       <id>org.flightgear.fgaddon.stable_2018</id>
     </alternate-version>
diff --git a/catalog/stable-2018-catalog/template.xml b/catalog/stable-2018-catalog/template.xml
index db463a5..d77d369 100644
--- a/catalog/stable-2018-catalog/template.xml
+++ b/catalog/stable-2018-catalog/template.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Template catalog - copy and modify for your site as required-->
 <PropertyList>
   <template>
-	  <version n="0">2018.1.*</version>
-	  <version n="1">2018.2.*</version>
-	  <version n="2">2018.3.*</version>
+	  <version n="0">2018.3.*</version>
     <id>org.flightgear.fgaddon.stable_2018</id>
     <license>GPL</license>
     <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
@@ -16,22 +13,35 @@
     <alternate-version>
 	    <version>2019.*</version>
 	    <version>2018.4.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/catalog.xml</url>
+      <id>org.flightgear.fgaddon.trunk</id>
+    </alternate-version>
+
+
+    <!-- alternate version previously did not allow multiple version entries, so we
+    duplicate the alternate version here -->
+    <alternate-version>
+      <version>2018.2.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+      <id>org.flightgear.fgaddon</id>
+    </alternate-version>
+
+	 <alternate-version>
+      <version>2018.1.*</version>
       <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
       <id>org.flightgear.fgaddon</id>
     </alternate-version>
 
     <alternate-version>
       <version>2017.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-legacy/catalog.xml</url>
-      <id>org.flightgear.fgaddon.legacy</id>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+      <id>org.flightgear.fgaddon</id>
     </alternate-version>
 
-    <!-- alternate version previously did not allow multiple version entries, so we
-    duplicate the alternate version here -->
     <alternate-version>
       <version>2016.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-legacy/catalog.xml</url>
-      <id>org.flightgear.fgaddon.legacy</id>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
+      <id>org.flightgear.fgaddon</id>
     </alternate-version>
     </template>
 </PropertyList>