diff --git a/manifest.toml b/manifest.toml
index bcb6c47..56f7fec 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -56,8 +56,8 @@ ram.runtime = "50M"
     [resources.sources.client]
     url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-1.5.4.war"
     sha256 = "5728b563911bd64bce0a0b81c74ea8ccb2190d1785bff34030fc6885a8273d3e"
-    format = "whatever"
-    extract = false
+    format = "zip"
+    extract = true
 
     [resources.sources.auth-header]
     url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-auth-header-1.5.4.tar.gz"
@@ -119,7 +119,7 @@ ram.runtime = "50M"
         "libssl-dev",
         "libvorbis-dev",
         "libwebp-dev",
-        "tomcat9",
+        # "tomcat9",
     ]
 
     [resources.database]
diff --git a/scripts/upgrade b/scripts/upgrade
index 31f0a36..b2715ac 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -92,8 +92,8 @@ ynh_script_progression --message="Compiling guacd..." --weight=30
 
 pushd "$install_dir/.guacd-src"
 	LDFLAGS="-lrt" ./configure --enable-allow-freerdp-snapshots --prefix="$install_dir" --datadir="$install_dir" --with-freerdp-plugin-dir="$install_dir/lib/x86_64-linux-gnu/freerdp2"
-	ynh_exec_warn_less make
-	ynh_exec_warn_less make install
+	ynh_exec_warn_less env LDFLAGS="-lrt" make
+	ynh_exec_warn_less env LDFLAGS="-lrt" make install
 popd
 
 #=================================================