--- configure.in
+++ configure.in
@@ -39,10 +39,6 @@
 cgiexecdir='${exec_prefix}/cgi-bin'
 driverexecdir='${exec_prefix}/bin'
 htmldir='${prefix}/html'
-pkgcfgdir='/usr/lib/pkgconfig'
-if test ! -d "${pkgcfgdir}"; then
-   pkgcfgdir=''
-fi
 hotplugdir='/etc/hotplug'
 if test ! -d "${hotplugdir}"; then
    hotplugdir=''
@@ -635,35 +631,6 @@
 ])
 
 
-AC_MSG_CHECKING(whether to enable pkg-config support)
-AC_ARG_WITH(pkgconfig-dir,
- AC_HELP_STRING([--with-pkgconfig-dir=PATH], [where to install pkg-config *.pc files (/usr/lib/pkgconfig)]),
- [
-    case "${withval}" in
-        yes)
-            if test -z "${pkgcfgdir}"; then
-	       AC_MSG_RESULT(no)
-               AC_MSG_ERROR(["pkg-config directory requested but not found])
-            fi
-        ;;
-        auto)
-        ;;
-        no)
-            pkgcfgdir=""
-        ;;
-        *)
-            pkgcfgdir="${withval}"
-        ;;
-    esac
- ],
- )
-if test -n "${pkgcfgdir}"; then
-  AC_MSG_RESULT(using ${pkgcfgdir})
-else
-  AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(WITH_PKG_CONFIG, test -n "${pkgcfgdir}")
-
 AC_MSG_CHECKING(whether to install hotplug rules)
 AC_ARG_WITH(hotplug-dir,
  AC_HELP_STRING([--with-hotplug-dir=PATH], [where to install hotplug rules (/etc/hotplug)]),
--- lib/Makefile.am
+++ lib/Makefile.am
@@ -1,8 +1,7 @@
 # Network UPS Tools: lib
 
 if WITH_LIB
-if WITH_PKG_CONFIG
- pkgcfg_DATA = libupsclient.pc
-endif
+pkgconfig_DATA = libupsclient.pc
+pkgconfigdir = $(libdir)/pkgconfig
 bin_SCRIPTS = libupsclient-config
 endif
--- lib/libupsclient-config.in
+++ lib/libupsclient-config.in
@@ -10,8 +10,8 @@
 Version="@PACKAGE_VERSION@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-Libs="-L@libdir@ -lupsclient @SSL_LDFLAGS@"
-Cflags="-I@includedir@ @SSL_CFLAGS@"
+Libs="-L@libdir@ -lupsclient @LIBSSL_LDFLAGS@"
+Cflags="-I@includedir@ @LIBSSL_CFLAGS@"
 
 case "$1" in
 
--- lib/libupsclient.pc.in
+++ lib/libupsclient.pc.in
@@ -9,5 +9,5 @@
 Name: libupsclient
 Description: UPS monitoring with Network UPS Tools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
-Cflags: -I${includedir} @SSL_CFLAGS@
+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
+Cflags: -I${includedir} @LIBSSL_CFLAGS@