diff --git a/catalog/adacore/florist.yaml b/catalog/adacore/florist.yaml
new file mode 100644
index 0000000..3651794
--- /dev/null
+++ b/catalog/adacore/florist.yaml
@@ -0,0 +1,21 @@
+---
+name: florist
+source:
+  url: http://libre.adacore.com
+  scm: file
+  versions:
+    -
+      version: 2016
+      filename: 'florist-gpl-2016-src.tar.gz'
+      url: 'http://mirrors.cdn.adacore.com/art/57399229c7a447658e0aff79'
+      sha256: 7b714fe7bf78749998466418f5666ffc6cfadc12;
+schematics:
+requirements:
+prepare:
+  - "./configure --prefix=${SCHEMATIC_INSTALL_PREFIX}"
+build:
+  - "make -j${SCHEMATIC_PARALLELISM}"
+install:
+  - "make install"
+
+# vim: ts=2 sw=2 et
diff --git a/catalog/tkoskine/ahven.yaml b/catalog/tkoskine/ahven.yaml
index 26faee0..27a8389 100644
--- a/catalog/tkoskine/ahven.yaml
+++ b/catalog/tkoskine/ahven.yaml
@@ -2,12 +2,17 @@
 name: ahven
 source:
   url: http://www.ahven-framework.com
+  scm: file
   versions:
-    2.6:
+    -
+      version: 2.6
       url: 'http://www.ahven-framework.com/releases/ahven-2.6.tar.gz'
+      filename: ahven-2.6.tar.gz
       sha256: '9ad43885c333c1d93cb106dbf8f361bac33b793d9892930a540eebdf23c1c4a5'
-    2.5:
+    -
+      version: 2.5
       url: 'http://www.ahven-framework.com/releases/ahven-2.5.tar.gz'
+      filename: ahven-2.5.tar.gz
       sha256: 'bcdd9f94af40fd570a725f7e86e61dcdff574ec67f7e1aca7c522f1549567fd5'
 schematics:
 requirements:
@@ -16,6 +21,6 @@ prepare:
 build:
   - "make -j${SCHEMATIC_PARALLELISM}"
 install:
-  - "make install"
+  - "DESTDIR=${SCHEMATIC_INSTALL_PREFIX} make install"
 
 # vim: ts=2 sw=2 et