diff --git a/CHANGES b/CHANGES
index 58adf5e1..1bf5efec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ What's New for OpenJPEG
 
 January 13, 2001
 + [rdieter] add pkg-config support to cmake
+! [rdieter] adjust autotools pkg-config support to match
 
 January 9, 2011 
 - [antonin] removed forgotten debug info in imagetopnm().
diff --git a/Makefile.am b/Makefile.am
index 5805b7fe..26e1df0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ clean-local:
 
 distclean-local: clean-local
 
-pkgconf_dir = /usr/lib/pkgconfig
+pkgconf_dir = $(libdir)/pkgconfig
 
 install-data-hook:
 	@echo ""
@@ -20,7 +20,7 @@ install-data-hook:
 	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
 	@echo ""
 	@$(INSTALL) -d $(pkgconf_dir)
-	@cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc
+	@cp libopenjpeg1.pc $(pkgconf_dir)/libopenjpeg1.pc
 	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \
 	$(LN_S) libopenjpeg1.pc libopenjpeg.pc)
 
diff --git a/libopenjpeg.pc.in b/libopenjpeg1.pc.in
similarity index 83%
rename from libopenjpeg.pc.in
rename to libopenjpeg1.pc.in
index e75e2bd4..83959217 100644
--- a/libopenjpeg.pc.in
+++ b/libopenjpeg1.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: openjpeg
 Description: JPEG2000 files library
-URL: http://code.google.com/p/openjpeg/
+URL: http://www.openjpeg.org/
 Version: @VERSION@
 Libs: -L${libdir} -lopenjpeg
 Cflags: -I${includedir}