diff --git a/config/lib.json b/config/lib.json
index 40422539..bc067ce1 100644
--- a/config/lib.json
+++ b/config/lib.json
@@ -391,6 +391,9 @@
             "openssl",
             "zlib",
             "readline"
+        ],
+        "lib-suggests": [
+            "icu"
         ]
     },
     "pthreads4w": {
diff --git a/src/SPC/builder/unix/library/postgresql.php b/src/SPC/builder/unix/library/postgresql.php
index 87456f22..40b39c41 100644
--- a/src/SPC/builder/unix/library/postgresql.php
+++ b/src/SPC/builder/unix/library/postgresql.php
@@ -57,7 +57,7 @@ trait postgresql
                 '--with-ssl=openssl ' .
                 '--with-readline ' .
                 '--with-libxml ' .
-                '--without-icu ' .
+                ($this->builder->getLib('icu') ? '--with-icu ' : '--without-icu ') .
                 '--without-ldap ' .
                 '--without-libxslt ' .
                 '--without-lz4 ' .