diff --git a/CHANGES b/CHANGES
index 75acaceed3f5745516b30181543e89ad33b9df8f..acac07a4b3759a11b8742b01b946aefc2d1a5cf6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.2b and 0.9.3
 
+  *) Move openssl.cnf out of lib/.
+     [Ulf Möller]
+
   *) Fix various things to let OpenSSL even pass ``egcc -pipe -O2 -Wall
      -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes
      -Wmissing-declarations -Wnested-externs -Winline'' with EGCS 1.1.2+ 
diff --git a/INSTALL b/INSTALL
index bf0046c80bb7fceb1ea3e691e8469cc566d442fd..f8dc959053bcef93bb5ac8426d76978d5a79a4b6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -134,7 +134,6 @@
 
        certs           Initially empty, this is the default location
                        for certificate files.
-       lib             Contains the OpenSSL configuration file "openssl.cnf".
        misc            Various scripts.
        private         Initially empty, this is the default location
                        for private key files.
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 124879c500953f599ea3af6c6a7c105779ffad4a..9e197937285a50419b101a9bc2346c5406186def 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -101,8 +101,8 @@ install:
 	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
 	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
 	 done
-	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/lib; \
-	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/lib/openssl.cnf
+	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
+	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 
 tags:
 	ctags $(SRC)
diff --git a/apps/ca.c b/apps/ca.c
index 323eb8525f47e42b636ffa91c116ead7367d9df3..0ee8559c972f20c79bc69724516b1fa9a4771307 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -83,7 +83,7 @@
 #define PROG ca_main
 
 #define BASE_SECTION	"ca"
-#define CONFIG_FILE "lib/openssl.cnf"
+#define CONFIG_FILE "openssl.cnf"
 
 #define ENV_DEFAULT_CA		"default_ca"