diff --git a/Dockerfile.chrome b/chrome/Dockerfile
similarity index 96%
rename from Dockerfile.chrome
rename to chrome/Dockerfile
index 863de0d..68554d8 100644
--- a/Dockerfile.chrome
+++ b/chrome/Dockerfile
@@ -40,7 +40,7 @@ RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL}
 RUN tar xf ${NGHTTP2_VERSION}.tar.bz2
 
 # Patch nghttp2 pkg config file to support static builds.
-COPY libnghttp2-*.patch ${NGHTTP2_VERSION}/
+COPY patches/libnghttp2-*.patch ${NGHTTP2_VERSION}/
 RUN cd ${NGHTTP2_VERSION} && \
     for p in $(ls libnghttp2-*.patch); do patch -p1 < $p; done && \
     autoreconf -i && automake && autoconf
@@ -56,7 +56,7 @@ RUN curl -o ${CURL_VERSION}.tar.xz https://curl.se/download/${CURL_VERSION}.tar.
 RUN tar xf ${CURL_VERSION}.tar.xz
 
 # Patch curl and re-generate the configure script
-COPY curl-*.patch ${CURL_VERSION}/
+COPY patches/curl-*.patch ${CURL_VERSION}/
 RUN cd ${CURL_VERSION} && \
     for p in $(ls curl-*.patch); do patch -p1 < $p; done && \
     autoreconf -fi
diff --git a/curl_chrome98 b/chrome/curl_chrome98
similarity index 100%
rename from curl_chrome98
rename to chrome/curl_chrome98
diff --git a/chrome/patches/curl-configure.patch b/chrome/patches/curl-configure.patch
new file mode 100644
index 0000000..8e5c749
--- /dev/null
+++ b/chrome/patches/curl-configure.patch
@@ -0,0 +1,17 @@
+--- curl-7.81.0-original/configure.ac	2022-01-03 18:36:46.000000000 +0200
++++ curl-7.81.0/configure.ac	2022-02-17 13:40:02.248497926 +0200
+@@ -2575,3 +2575,3 @@
+     LIB_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path])
+-      $PKGCONFIG --libs-only-l libnghttp2`
++      $PKGCONFIG --static --libs-only-l libnghttp2`
+     AC_MSG_NOTICE([-l is $LIB_H2])
+@@ -2579,3 +2579,3 @@
+     CPP_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path]) dnl
+-      $PKGCONFIG --cflags-only-I libnghttp2`
++      $PKGCONFIG --static --cflags-only-I libnghttp2`
+     AC_MSG_NOTICE([-I is $CPP_H2])
+@@ -2583,3 +2583,3 @@
+     LD_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path])
+-      $PKGCONFIG --libs-only-L libnghttp2`
++      $PKGCONFIG --static --libs-only-L libnghttp2`
+     AC_MSG_NOTICE([-L is $LD_H2])
diff --git a/curl-http2-b.patch b/chrome/patches/curl-http-h.patch
similarity index 100%
rename from curl-http2-b.patch
rename to chrome/patches/curl-http-h.patch
diff --git a/curl-http2-a.patch b/chrome/patches/curl-http2-c.patch
similarity index 100%
rename from curl-http2-a.patch
rename to chrome/patches/curl-http2-c.patch
diff --git a/curl-http2-d.patch b/chrome/patches/curl-http2-h.patch
similarity index 100%
rename from curl-http2-d.patch
rename to chrome/patches/curl-http2-h.patch
diff --git a/curl-http2-c.patch b/chrome/patches/curl-multi-c.patch
similarity index 100%
rename from curl-http2-c.patch
rename to chrome/patches/curl-multi-c.patch
diff --git a/curl-openssl.patch b/chrome/patches/curl-openssl-c.patch
similarity index 100%
rename from curl-openssl.patch
rename to chrome/patches/curl-openssl-c.patch
diff --git a/chrome/patches/libnghttp2-pc.patch b/chrome/patches/libnghttp2-pc.patch
new file mode 100644
index 0000000..0758b8b
--- /dev/null
+++ b/chrome/patches/libnghttp2-pc.patch
@@ -0,0 +1,8 @@
+--- nghttp2-1.46.0-original/lib/libnghttp2.pc.in	2021-10-19 12:31:47.000000000 +0300
++++ nghttp2-1.46.0/lib/libnghttp2.pc.in	2022-02-17 13:44:46.722604316 +0200
+@@ -31,3 +31,4 @@
+ Version: @VERSION@
+-Libs: -L${libdir} -lnghttp2
++Libs: -L${libdir}
++Libs.private: -l:libnghttp2.a
+ Cflags: -I${includedir}