diff --git a/Makefile.am b/Makefile.am
index 5998971..02f1eb0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,9 @@ EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \
 
 # Simplify conditions below by declaring variables as empty
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libiscsi.pc
+
 bin_PROGRAMS =
 noinst_PROGRAMS =
 EXTRA_PROGRAMS =
@@ -172,8 +175,7 @@ if ISCSITEST
 
 noinst_PROGRAMS += bin/iscsi-test-cu
 # dist_noinst_HEADERS += test-tool/iscsi-test-cu.h
-bin_iscsi_test_cu_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/test-tool \
-	-I/usr/local/include
+bin_iscsi_test_cu_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/test-tool
 bin_iscsi_test_cu_LDFLAGS = -ldl -lcunit
 bin_iscsi_test_cu_SOURCES = test-tool/iscsi-test-cu.c \
 	test-tool/iscsi-support.c \
diff --git a/configure.ac b/configure.ac
index b6fe383..7995d06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,16 +6,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
 LT_INIT
-if test "${libdir}" = '${exec_prefix}/lib'; then
-  case `uname -m` in
-    x86_64|ppc64|powerpc64)
-      libdir='${exec_prefix}/lib64'
-      ;;
-    *)
-      libdir='${exec_prefix}/lib'
-      ;;
-  esac
-fi
 
 AC_CANONICAL_HOST
 AM_CONDITIONAL(LD_ISCSI,
@@ -111,5 +101,5 @@ fi
 AM_CONDITIONAL(ISCSITEST, [test "$ac_cv_have_cunit" = yes])
 
 
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(Makefile libiscsi.pc)
 AC_OUTPUT
diff --git a/libiscsi.pc.in b/libiscsi.pc.in
new file mode 100644
index 0000000..7b1fee5
--- /dev/null
+++ b/libiscsi.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libiscsi
+Description: iSCSI initiator library
+Version: @VERSION@
+
+Libs: -L${libdir} -liscsi
+Libs.private:
+Cflags: -I${includedir}
diff --git a/packaging/RPM/libiscsi.spec.in b/packaging/RPM/libiscsi.spec.in
index 821e2f2..55211fb 100644
--- a/packaging/RPM/libiscsi.spec.in
+++ b/packaging/RPM/libiscsi.spec.in
@@ -89,6 +89,7 @@ The libiscsi-devel package includes the header files for libiscsi.
 %{_includedir}/iscsi/iscsi.h
 %{_includedir}/iscsi/scsi-lowlevel.h
 %{_libdir}/libiscsi.so
+%{_libdir}/pkgconfig/libiscsi.pc
 
 %changelog
 * Sat Jan 5 2013 : 1.8.0