--- /dev/null
+diff --git a/configure b/configure
+index 75210f0..6ea5e1f 100755
+--- a/configure
++++ b/configure
+@@ -11708,6 +11708,62 @@ if test "$ac_res" != no; then :
+
+ fi
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing CertOpenStore" >&5
++$as_echo_n "checking for library containing CertOpenStore... " >&6; }
++if ${ac_cv_search_CertOpenStore+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char CertOpenStore ();
++int
++main ()
++{
++return CertOpenStore ();
++ ;
++ return 0;
++}
++_ACEOF
++for ac_lib in '' crypt32; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_CertOpenStore=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if ${ac_cv_search_CertOpenStore+:} false; then :
++ break
++fi
++done
++if ${ac_cv_search_CertOpenStore+:} false; then :
++
++else
++ ac_cv_search_CertOpenStore=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_CertOpenStore" >&5
++$as_echo "$ac_cv_search_CertOpenStore" >&6; }
++ac_res=$ac_cv_search_CertOpenStore
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
+
+ if test "$with_readline" = yes; then
+
+diff --git a/configure.in b/configure.in
+index 0832636..0911ec0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1158,6 +1158,7 @@ AC_SEARCH_LIBS(sched_yield, rt)
+ AC_SEARCH_LIBS(gethostbyname_r, nsl)
+ # Cygwin:
+ AC_SEARCH_LIBS(shmget, cygipc)
++AC_SEARCH_LIBS(CertOpenStore, crypt32)
+
+ if test "$with_readline" = yes; then
+ PGAC_CHECK_READLINE