2006-06-25 Vivek Lakshmanan <vivekl@redhat.com>

	* gnu/java/security/.cvsignore: New File.
	* gnu/java/security/Configuration.java.in: New File.
	* gnu/java/security/Properties.java: Change import from
	gnu.classpath.Configuration to gnu.java.security.Configuration.
	* gnu/java/security/hash/Whirlpool.java: Likewise.
	* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
	* gnu/java/security/jce/sig/SignatureAdapter.java: Likewise.
	* gnu/java/security/key/dss/DSSKeyPairGenerator.java: Likewise.
	* gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java: Likewise.
	* gnu/java/security/key/dss/DSSPrivateKey.java: Likewise.
	* gnu/java/security/key/rsa/GnuRSAPrivateKey.java: Likewise.
	* gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Likewise.
	* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java: Likewise.
	* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java: Likewise.
	* gnu/java/security/pkcs/PKCS7SignedData.java: Likewise.
	* gnu/java/security/pkcs/SignerInfo.java: Likewise.
	* gnu/java/security/provider/PKIXCertPathValidatorImpl.java: Likewise.
	* gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise.
	* gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise.
	* gnu/java/security/util/Base64.java: Likewise.
	* gnu/java/security/x509/X509CRL.java: Likewise.
	* gnu/java/security/x509/X509CRLEntry.java: Likewise.
	* gnu/java/security/x509/ext/Extension.java: Likewise.
	* gnu/javax/crypto/cipher/Anubis.java: Likewise.
	* gnu/javax/crypto/cipher/BaseCipher.java: Likewise.
	* gnu/javax/crypto/cipher/Khazad.java: Likewise.
	* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
	* gnu/javax/crypto/cipher/Twofish.java: Likewise.
	* gnu/javax/crypto/jce/keyring/GnuKeyring.java: Likewise.
	* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
	* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
	* gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java: Likewise.
	* gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java: Likewise.
	* gnu/javax/crypto/keyring/Entry.java: Likewise.
	* gnu/javax/crypto/keyring/EnvelopeEntry.java: Likewise.
	* gnu/javax/crypto/keyring/GnuPrivateKeyring.java: Likewise.
	* gnu/javax/crypto/keyring/GnuPublicKeyring.java: Likewise.
	* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
	* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java: Likewise.
	* gnu/javax/crypto/mac/OMAC.java: Likewise.
	* gnu/javax/crypto/pad/BasePad.java: Likewise.
	* gnu/javax/crypto/pad/PKCS1_V1_5.java: Likewise.
	* gnu/javax/crypto/pad/PKCS7.java: Likewise.
	* gnu/javax/crypto/pad/TBC.java: Likewise.
	* gnu/javax/crypto/prng/CSPRNG.java: Likewise.
	* gnu/javax/crypto/sasl/SaslInputStream.java: Likewise.
	* gnu/javax/crypto/sasl/SaslOutputStream.java: Likewise.
	* gnu/javax/crypto/sasl/srp/SRPClient.java: Likewise.
	* gnu/javax/crypto/sasl/srp/SRPServer.java: Likewise.
	* gnu/javax/security/auth/login/ConfigFileParser.java: Likewise.
	* gnu/javax/security/auth/login/ConfigFileTokenizer.java: Likewise.
	* gnu/javax/security/auth/login/GnuConfiguration.java
	(getAppConfigurationEntry): Change reference to
	gnu.classpath.Configuration.DEBUG to
	gnu.java.security.Configuration.DEBUG.
	(getConfigFromUserHome): Likewise.
	(getInputStreamFromURL): Likewise.
	(getUserHome): Likewise.
	(init): Likewise.
	(processSecurityProperties): Likewise.
	(processSystemProperty): Likewise.
	(processUserHome): Likewise.
	* configure.ac: Add gnu/java/security/Configuration.java to
	AC_CONFIG_FILES list.
	* lib/Makefile.am: Remove gnu/java/security/Configuration.java when
	required.

54 files changed, 193 insertions, 67 deletions

diff --git a/ChangeLog b/ChangeLog
index 6951bfac5..53bbc0119 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,70 @@
+2006-06-25  Vivek Lakshmanan  <vivekl@redhat.com>
+	
+	* gnu/java/security/.cvsignore: New File.
+	* gnu/java/security/Configuration.java.in: New File.
+	* gnu/java/security/Properties.java: Change import from 
+	gnu.classpath.Configuration to gnu.java.security.Configuration.
+	* gnu/java/security/hash/Whirlpool.java: Likewise.
+	* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
+	* gnu/java/security/jce/sig/SignatureAdapter.java: Likewise.
+	* gnu/java/security/key/dss/DSSKeyPairGenerator.java: Likewise.
+	* gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java: Likewise.
+	* gnu/java/security/key/dss/DSSPrivateKey.java: Likewise.
+	* gnu/java/security/key/rsa/GnuRSAPrivateKey.java: Likewise.
+	* gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Likewise.
+	* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java: Likewise.
+	* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java: Likewise.
+	* gnu/java/security/pkcs/PKCS7SignedData.java: Likewise.
+	* gnu/java/security/pkcs/SignerInfo.java: Likewise.
+	* gnu/java/security/provider/PKIXCertPathValidatorImpl.java: Likewise.
+	* gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise.
+	* gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise.
+	* gnu/java/security/util/Base64.java: Likewise.
+	* gnu/java/security/x509/X509CRL.java: Likewise.
+	* gnu/java/security/x509/X509CRLEntry.java: Likewise.
+	* gnu/java/security/x509/ext/Extension.java: Likewise.
+	* gnu/javax/crypto/cipher/Anubis.java: Likewise.
+	* gnu/javax/crypto/cipher/BaseCipher.java: Likewise.
+	* gnu/javax/crypto/cipher/Khazad.java: Likewise.
+	* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
+	* gnu/javax/crypto/cipher/Twofish.java: Likewise.
+	* gnu/javax/crypto/jce/keyring/GnuKeyring.java: Likewise.
+	* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
+	* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
+	* gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java: Likewise.
+	* gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java: Likewise.
+	* gnu/javax/crypto/keyring/Entry.java: Likewise.
+	* gnu/javax/crypto/keyring/EnvelopeEntry.java: Likewise.
+	* gnu/javax/crypto/keyring/GnuPrivateKeyring.java: Likewise.
+	* gnu/javax/crypto/keyring/GnuPublicKeyring.java: Likewise.
+	* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
+	* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java: Likewise.
+	* gnu/javax/crypto/mac/OMAC.java: Likewise.
+	* gnu/javax/crypto/pad/BasePad.java: Likewise.
+	* gnu/javax/crypto/pad/PKCS1_V1_5.java: Likewise.
+	* gnu/javax/crypto/pad/PKCS7.java: Likewise.
+	* gnu/javax/crypto/pad/TBC.java: Likewise.
+	* gnu/javax/crypto/prng/CSPRNG.java: Likewise.
+	* gnu/javax/crypto/sasl/SaslInputStream.java: Likewise.
+	* gnu/javax/crypto/sasl/SaslOutputStream.java: Likewise.
+	* gnu/javax/crypto/sasl/srp/SRPClient.java: Likewise.
+	* gnu/javax/crypto/sasl/srp/SRPServer.java: Likewise.
+	* gnu/javax/security/auth/login/ConfigFileParser.java: Likewise.
+	* gnu/javax/security/auth/login/ConfigFileTokenizer.java: Likewise.
+	* gnu/javax/security/auth/login/GnuConfiguration.java 
+	(getAppConfigurationEntry): Change reference to 
+	gnu.classpath.Configuration.DEBUG to gnu.java.security.Configuration.DEBUG.
+	(getConfigFromUserHome): Likewise.
+	(getInputStreamFromURL): Likewise.
+	(getUserHome): Likewise.
+	(init): Likewise.
+	(processSecurityProperties): Likewise.
+	(processSystemProperty): Likewise.
+	(processUserHome): Likewise.
+	* configure.ac: Add gnu/java/security/Configuration.java to AC_CONFIG_FILES list.
+	* lib/Makefile.am: Remove gnu/java/security/Configuration.java when required.
+	
+
 2006-06-25  Carsten Neumann  <cn-develop@gmx.net>
 
 	* javax/swing/text/DefaultCaret.java (isActive): New method.
diff --git a/configure.ac b/configure.ac
index 284e6f9ca..9e373a9a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -733,6 +733,7 @@ external/sax/Makefile
 external/w3c_dom/Makefile
 external/relaxngDatatype/Makefile
 gnu/classpath/Configuration.java
+gnu/java/security/Configuration.java
 include/Makefile
 native/Makefile
 native/fdlibm/Makefile
diff --git a/gnu/java/security/.cvsignore b/gnu/java/security/.cvsignore
new file mode 100644
index 000000000..11f6639eb
--- /dev/null
+++ b/gnu/java/security/.cvsignore
@@ -0,0 +1 @@
+Configuration.java
diff --git a/gnu/java/security/Configuration.java.in b/gnu/java/security/Configuration.java.in
new file mode 100644
index 000000000..1deb543d4
--- /dev/null
+++ b/gnu/java/security/Configuration.java.in
@@ -0,0 +1,56 @@
+/* Configuration.java --
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.security;
+
+/**
+ * This file defines compile-time constants that can be accessed by
+ * our crypto code. All crypto code should use and define such
+ * constants here instead of using the gnu.classpath.Configuration class.
+ */
+public interface Configuration
+{
+
+  /**
+   * The value of DEBUG is substituted according to whether the
+   * "--enable-debug" argument was passed to configure. Code
+   * which is made conditional based on the value of this flag - typically 
+   * code that generates debugging output - will be removed by the optimizer 
+   * in a non-debug build.
+   */
+  boolean DEBUG = @LIBDEBUG@;
+}
diff --git a/gnu/java/security/Properties.java b/gnu/java/security/Properties.java
index a6ccfd483..a515a5428 100644
--- a/gnu/java/security/Properties.java
+++ b/gnu/java/security/Properties.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/gnu/java/security/hash/Whirlpool.java b/gnu/java/security/hash/Whirlpool.java
index ae669d29e..89df5c51b 100644
--- a/gnu/java/security/hash/Whirlpool.java
+++ b/gnu/java/security/hash/Whirlpool.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.hash;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
diff --git a/gnu/java/security/jce/sig/EncodedKeyFactory.java b/gnu/java/security/jce/sig/EncodedKeyFactory.java
index 7e6d1bb2e..19ec088c5 100644
--- a/gnu/java/security/jce/sig/EncodedKeyFactory.java
+++ b/gnu/java/security/jce/sig/EncodedKeyFactory.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.jce.sig;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.key.dss.DSSPrivateKey;
 import gnu.java.security.key.dss.DSSPublicKey;
diff --git a/gnu/java/security/jce/sig/SignatureAdapter.java b/gnu/java/security/jce/sig/SignatureAdapter.java
index 3202650b0..a65d727ee 100644
--- a/gnu/java/security/jce/sig/SignatureAdapter.java
+++ b/gnu/java/security/jce/sig/SignatureAdapter.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.jce.sig;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.sig.BaseSignature;
 import gnu.java.security.sig.ISignature;
 import gnu.java.security.sig.ISignatureCodec;
diff --git a/gnu/java/security/key/dss/DSSKeyPairGenerator.java b/gnu/java/security/key/dss/DSSKeyPairGenerator.java
index 196565acc..1bad0b62e 100644
--- a/gnu/java/security/key/dss/DSSKeyPairGenerator.java
+++ b/gnu/java/security/key/dss/DSSKeyPairGenerator.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.key.dss;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.key.IKeyPairGenerator;
diff --git a/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java b/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
index c15c671ad..06b8e849a 100644
--- a/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
+++ b/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.key.dss;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
diff --git a/gnu/java/security/key/dss/DSSPrivateKey.java b/gnu/java/security/key/dss/DSSPrivateKey.java
index c27160f68..6c64987bc 100644
--- a/gnu/java/security/key/dss/DSSPrivateKey.java
+++ b/gnu/java/security/key/dss/DSSPrivateKey.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.key.dss;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairCodec;
diff --git a/gnu/java/security/key/rsa/GnuRSAPrivateKey.java b/gnu/java/security/key/rsa/GnuRSAPrivateKey.java
index e52851170..ef466d020 100644
--- a/gnu/java/security/key/rsa/GnuRSAPrivateKey.java
+++ b/gnu/java/security/key/rsa/GnuRSAPrivateKey.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.key.rsa;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairCodec;
diff --git a/gnu/java/security/key/rsa/RSAKeyPairGenerator.java b/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
index 5c2db61e2..c31cc4cc1 100644
--- a/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
+++ b/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.key.rsa;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
diff --git a/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java b/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
index fe92d1af4..7fa9d0102 100644
--- a/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
+++ b/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.key.rsa;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
diff --git a/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java b/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
index 733738f73..b11e1c013 100644
--- a/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
+++ b/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.key.rsa;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
diff --git a/gnu/java/security/pkcs/PKCS7SignedData.java b/gnu/java/security/pkcs/PKCS7SignedData.java
index de2b2f679..d59dba3cd 100644
--- a/gnu/java/security/pkcs/PKCS7SignedData.java
+++ b/gnu/java/security/pkcs/PKCS7SignedData.java
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 package gnu.java.security.pkcs;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.ber.BER;
 import gnu.java.security.ber.BEREncodingException;
diff --git a/gnu/java/security/pkcs/SignerInfo.java b/gnu/java/security/pkcs/SignerInfo.java
index 662bcc3b7..3066401ac 100644
--- a/gnu/java/security/pkcs/SignerInfo.java
+++ b/gnu/java/security/pkcs/SignerInfo.java
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 package gnu.java.security.pkcs;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.ber.BER;
 import gnu.java.security.ber.BEREncodingException;
diff --git a/gnu/java/security/provider/PKIXCertPathValidatorImpl.java b/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
index 430b51b13..cdfad3f61 100644
--- a/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
+++ b/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.key.dss.DSSPublicKey;
diff --git a/gnu/java/security/sig/rsa/EMSA_PSS.java b/gnu/java/security/sig/rsa/EMSA_PSS.java
index 5dd7e28eb..97b3afcf8 100644
--- a/gnu/java/security/sig/rsa/EMSA_PSS.java
+++ b/gnu/java/security/sig/rsa/EMSA_PSS.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.sig.rsa;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.hash.HashFactory;
 import gnu.java.security.hash.IMessageDigest;
 import gnu.java.security.util.Util;
diff --git a/gnu/java/security/sig/rsa/RSAPSSSignature.java b/gnu/java/security/sig/rsa/RSAPSSSignature.java
index 053d653a1..27c7fe620 100644
--- a/gnu/java/security/sig/rsa/RSAPSSSignature.java
+++ b/gnu/java/security/sig/rsa/RSAPSSSignature.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.sig.rsa;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.HashFactory;
 import gnu.java.security.hash.IMessageDigest;
diff --git a/gnu/java/security/util/Base64.java b/gnu/java/security/util/Base64.java
index 38a1c7e1e..9b2ae12dc 100644
--- a/gnu/java/security/util/Base64.java
+++ b/gnu/java/security/util/Base64.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.java.security.util;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.io.UnsupportedEncodingException;
 import java.util.logging.Logger;
diff --git a/gnu/java/security/x509/X509CRL.java b/gnu/java/security/x509/X509CRL.java
index d8cbe988b..7c471c972 100644
--- a/gnu/java/security/x509/X509CRL.java
+++ b/gnu/java/security/x509/X509CRL.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
diff --git a/gnu/java/security/x509/X509CRLEntry.java b/gnu/java/security/x509/X509CRLEntry.java
index f3f3a93d6..26b40363c 100644
--- a/gnu/java/security/x509/X509CRLEntry.java
+++ b/gnu/java/security/x509/X509CRLEntry.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
diff --git a/gnu/java/security/x509/ext/Extension.java b/gnu/java/security/x509/ext/Extension.java
index 4deafe23e..69251987e 100644
--- a/gnu/java/security/x509/ext/Extension.java
+++ b/gnu/java/security/x509/ext/Extension.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
diff --git a/gnu/javax/crypto/cipher/Anubis.java b/gnu/javax/crypto/cipher/Anubis.java
index 5e3227c30..653957ec6 100644
--- a/gnu/javax/crypto/cipher/Anubis.java
+++ b/gnu/javax/crypto/cipher/Anubis.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.cipher;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
diff --git a/gnu/javax/crypto/cipher/BaseCipher.java b/gnu/javax/crypto/cipher/BaseCipher.java
index 6a76bd976..a5bbe6987 100644
--- a/gnu/javax/crypto/cipher/BaseCipher.java
+++ b/gnu/javax/crypto/cipher/BaseCipher.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.cipher;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.security.InvalidKeyException;
 import java.util.Arrays;
diff --git a/gnu/javax/crypto/cipher/Khazad.java b/gnu/javax/crypto/cipher/Khazad.java
index bb4aeb025..491301f5a 100644
--- a/gnu/javax/crypto/cipher/Khazad.java
+++ b/gnu/javax/crypto/cipher/Khazad.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.cipher;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
diff --git a/gnu/javax/crypto/cipher/Rijndael.java b/gnu/javax/crypto/cipher/Rijndael.java
index 325658ee2..d1bc958c3 100644
--- a/gnu/javax/crypto/cipher/Rijndael.java
+++ b/gnu/javax/crypto/cipher/Rijndael.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.cipher;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
diff --git a/gnu/javax/crypto/cipher/Twofish.java b/gnu/javax/crypto/cipher/Twofish.java
index 09faf0f44..b69324428 100644
--- a/gnu/javax/crypto/cipher/Twofish.java
+++ b/gnu/javax/crypto/cipher/Twofish.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.cipher;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
diff --git a/gnu/javax/crypto/jce/keyring/GnuKeyring.java b/gnu/javax/crypto/jce/keyring/GnuKeyring.java
index ba89912f3..6f1dcd51f 100644
--- a/gnu/javax/crypto/jce/keyring/GnuKeyring.java
+++ b/gnu/javax/crypto/jce/keyring/GnuKeyring.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.jce.keyring;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.javax.crypto.keyring.GnuPrivateKeyring;
 import gnu.javax.crypto.keyring.GnuPublicKeyring;
diff --git a/gnu/javax/crypto/jce/prng/ICMRandomSpi.java b/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
index d759f26da..bee8be6f1 100644
--- a/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
+++ b/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.jce.prng;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.prng.LimitReachedException;
 import gnu.javax.crypto.cipher.IBlockCipher;
diff --git a/gnu/javax/crypto/jce/prng/UMacRandomSpi.java b/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
index 42b9218b8..702e20b9c 100644
--- a/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
+++ b/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.jce.prng;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.prng.LimitReachedException;
 import gnu.javax.crypto.cipher.IBlockCipher;
diff --git a/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java b/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
index 1cf1eb14d..989567f3d 100644
--- a/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
+++ b/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.key.dh;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.key.IKeyPairGenerator;
diff --git a/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java b/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
index d6adb3701..562347c95 100644
--- a/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
+++ b/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.key.srp6;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
diff --git a/gnu/javax/crypto/keyring/Entry.java b/gnu/javax/crypto/keyring/Entry.java
index a2e7e5d21..5a8431f98 100644
--- a/gnu/javax/crypto/keyring/Entry.java
+++ b/gnu/javax/crypto/keyring/Entry.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.keyring;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/gnu/javax/crypto/keyring/EnvelopeEntry.java b/gnu/javax/crypto/keyring/EnvelopeEntry.java
index 5e6d38312..58901475c 100644
--- a/gnu/javax/crypto/keyring/EnvelopeEntry.java
+++ b/gnu/javax/crypto/keyring/EnvelopeEntry.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.keyring;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
diff --git a/gnu/javax/crypto/keyring/GnuPrivateKeyring.java b/gnu/javax/crypto/keyring/GnuPrivateKeyring.java
index 5b6829e7b..8ecedcfb9 100644
--- a/gnu/javax/crypto/keyring/GnuPrivateKeyring.java
+++ b/gnu/javax/crypto/keyring/GnuPrivateKeyring.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.keyring;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 
 import java.io.DataInputStream;
diff --git a/gnu/javax/crypto/keyring/GnuPublicKeyring.java b/gnu/javax/crypto/keyring/GnuPublicKeyring.java
index 0828ca1a1..4e036ff63 100644
--- a/gnu/javax/crypto/keyring/GnuPublicKeyring.java
+++ b/gnu/javax/crypto/keyring/GnuPublicKeyring.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.keyring;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 
 import java.io.DataInputStream;
diff --git a/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java b/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
index 30a84dbf1..e7c1428a4 100644
--- a/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
+++ b/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.keyring;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.prng.IRandom;
 import gnu.java.security.prng.LimitReachedException;
diff --git a/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java b/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
index 92e740910..5670f3ed4 100644
--- a/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
+++ b/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.keyring;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.prng.IRandom;
 import gnu.java.security.prng.LimitReachedException;
diff --git a/gnu/javax/crypto/mac/OMAC.java b/gnu/javax/crypto/mac/OMAC.java
index b7edb5cdd..dc1f2f43b 100644
--- a/gnu/javax/crypto/mac/OMAC.java
+++ b/gnu/javax/crypto/mac/OMAC.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.mac;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 import gnu.javax.crypto.cipher.CipherFactory;
diff --git a/gnu/javax/crypto/pad/BasePad.java b/gnu/javax/crypto/pad/BasePad.java
index b54c77078..440026d8e 100644
--- a/gnu/javax/crypto/pad/BasePad.java
+++ b/gnu/javax/crypto/pad/BasePad.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.pad;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/gnu/javax/crypto/pad/PKCS1_V1_5.java b/gnu/javax/crypto/pad/PKCS1_V1_5.java
index 874908493..277097666 100644
--- a/gnu/javax/crypto/pad/PKCS1_V1_5.java
+++ b/gnu/javax/crypto/pad/PKCS1_V1_5.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.pad;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.sig.rsa.EME_PKCS1_V1_5;
 import gnu.java.security.util.PRNG;
diff --git a/gnu/javax/crypto/pad/PKCS7.java b/gnu/javax/crypto/pad/PKCS7.java
index d9084d13f..28c35d197 100644
--- a/gnu/javax/crypto/pad/PKCS7.java
+++ b/gnu/javax/crypto/pad/PKCS7.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.pad;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
diff --git a/gnu/javax/crypto/pad/TBC.java b/gnu/javax/crypto/pad/TBC.java
index 64fea18fd..7302ef15b 100644
--- a/gnu/javax/crypto/pad/TBC.java
+++ b/gnu/javax/crypto/pad/TBC.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.pad;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
diff --git a/gnu/javax/crypto/prng/CSPRNG.java b/gnu/javax/crypto/prng/CSPRNG.java
index 0e39f0f5a..910d15fec 100644
--- a/gnu/javax/crypto/prng/CSPRNG.java
+++ b/gnu/javax/crypto/prng/CSPRNG.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.prng;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Properties;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.HashFactory;
diff --git a/gnu/javax/crypto/sasl/SaslInputStream.java b/gnu/javax/crypto/sasl/SaslInputStream.java
index 14de9e12f..1bd305f5f 100644
--- a/gnu/javax/crypto/sasl/SaslInputStream.java
+++ b/gnu/javax/crypto/sasl/SaslInputStream.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.sasl;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.util.Util;
 
 import java.io.IOException;
diff --git a/gnu/javax/crypto/sasl/SaslOutputStream.java b/gnu/javax/crypto/sasl/SaslOutputStream.java
index 9d2aa020d..ce9d93242 100644
--- a/gnu/javax/crypto/sasl/SaslOutputStream.java
+++ b/gnu/javax/crypto/sasl/SaslOutputStream.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.sasl;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.util.Util;
 
 import java.io.IOException;
diff --git a/gnu/javax/crypto/sasl/srp/SRPClient.java b/gnu/javax/crypto/sasl/srp/SRPClient.java
index 0430342eb..231a49480 100644
--- a/gnu/javax/crypto/sasl/srp/SRPClient.java
+++ b/gnu/javax/crypto/sasl/srp/SRPClient.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.sasl.srp;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.MD5;
 import gnu.java.security.util.PRNG;
diff --git a/gnu/javax/crypto/sasl/srp/SRPServer.java b/gnu/javax/crypto/sasl/srp/SRPServer.java
index 18452555c..fa7cdae9c 100644
--- a/gnu/javax/crypto/sasl/srp/SRPServer.java
+++ b/gnu/javax/crypto/sasl/srp/SRPServer.java
@@ -38,7 +38,7 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.sasl.srp;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.PRNG;
 import gnu.java.security.util.Util;
diff --git a/gnu/javax/security/auth/login/ConfigFileParser.java b/gnu/javax/security/auth/login/ConfigFileParser.java
index c24dba0d0..b5b506923 100644
--- a/gnu/javax/security/auth/login/ConfigFileParser.java
+++ b/gnu/javax/security/auth/login/ConfigFileParser.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.javax.security.auth.login;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/gnu/javax/security/auth/login/ConfigFileTokenizer.java b/gnu/javax/security/auth/login/ConfigFileTokenizer.java
index bf820f7bc..06a1d2c7c 100644
--- a/gnu/javax/security/auth/login/ConfigFileTokenizer.java
+++ b/gnu/javax/security/auth/login/ConfigFileTokenizer.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.javax.security.auth.login;
 
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/gnu/javax/security/auth/login/GnuConfiguration.java b/gnu/javax/security/auth/login/GnuConfiguration.java
index 85b6bc3a0..8cd61c954 100644
--- a/gnu/javax/security/auth/login/GnuConfiguration.java
+++ b/gnu/javax/security/auth/login/GnuConfiguration.java
@@ -175,7 +175,7 @@ public final class GnuConfiguration extends Configuration
     if (loginModules == null || loginModules.size() == 0)
       return null;
 
-    if (gnu.classpath.Configuration.DEBUG)
+    if (gnu.java.security.Configuration.DEBUG)
       log.fine(appName + " -> " + loginModules.size() + " entry(ies)");
     return (AppConfigurationEntry[]) loginModules.toArray(new AppConfigurationEntry[0]);
   }
@@ -213,22 +213,22 @@ public final class GnuConfiguration extends Configuration
   {
     if (processSecurityProperties())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("Using login configuration defined by Security property(ies)");
       }
     else if (processSystemProperty())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("Using login configuration defined by System property");
       }
     else if (processUserHome())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("Using login configuration defined in ${user.home}");
       }
     else
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("No login configuration file found");
       }
   }
@@ -258,7 +258,7 @@ public final class GnuConfiguration extends Configuration
           s = s.trim();
           if (s.length() != 0)
             {
-              if (gnu.classpath.Configuration.DEBUG)
+              if (gnu.java.security.Configuration.DEBUG)
                 log.fine("java.security.auth.login.config.url." + counter
                          + " = " + s);
               parseConfig(getInputStreamFromURL(s));
@@ -267,7 +267,7 @@ public final class GnuConfiguration extends Configuration
         }
       catch (Throwable t)
         {
-          if (gnu.classpath.Configuration.DEBUG)
+          if (gnu.java.security.Configuration.DEBUG)
             log.fine("Exception while handling Security property at #"
                      + counter + ". Continue: " + t);
         }
@@ -298,7 +298,7 @@ public final class GnuConfiguration extends Configuration
       }
     catch (MalformedURLException x)
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("Failed opening as URL: " + s + ". Will try as File");
         result = new FileInputStream(s);
       }
@@ -323,7 +323,7 @@ public final class GnuConfiguration extends Configuration
             s = s.trim();
             if (s.length() != 0)
               {
-                if (gnu.classpath.Configuration.DEBUG)
+                if (gnu.java.security.Configuration.DEBUG)
                   log.fine("java.security.auth.login.config = " + s);
                 parseConfig(getInputStreamFromURL(s));
                 result = true;
@@ -332,7 +332,7 @@ public final class GnuConfiguration extends Configuration
       }
     catch (Throwable t)
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("Exception while handling System property. Continue: " + t);
       }
     return result;
@@ -363,7 +363,7 @@ public final class GnuConfiguration extends Configuration
 
         if (jaasFile == null)
           {
-            if (gnu.classpath.Configuration.DEBUG)
+            if (gnu.java.security.Configuration.DEBUG)
               log.fine("Login Configuration file, in " + userHome
                        + ", does not exist or is inaccessible");
             return result;
@@ -375,7 +375,7 @@ public final class GnuConfiguration extends Configuration
       }
     catch (Throwable t)
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("Exception (ignored) while handling ${user.home}: " + t);
       }
     return result;
@@ -413,7 +413,7 @@ public final class GnuConfiguration extends Configuration
     String uh = System.getProperty("user.home");
     if (uh == null || uh.trim().length() == 0)
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("User home path is not set or is empty");
         return null;
       }
@@ -421,19 +421,19 @@ public final class GnuConfiguration extends Configuration
     File result = new File(uh);
     if (! result.exists())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("User home '" + uh + "' does not exist");
         return null;
       }
     if (! result.isDirectory())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("User home '" + uh + "' is not a directory");
         return null;
       }
     if (! result.canRead())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("User home '" + uh + "' is not readable");
         return null;
       }
@@ -445,19 +445,19 @@ public final class GnuConfiguration extends Configuration
     File result = new File(userHome, fileName);
     if (! result.exists())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("File '" + fileName + "' does not exist in user's home");
         return null;
       }
     if (! result.isFile())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("File '" + fileName + "' in user's home is not a file");
         return null;
       }
     if (! result.canRead())
       {
-        if (gnu.classpath.Configuration.DEBUG)
+        if (gnu.java.security.Configuration.DEBUG)
           log.fine("File '" + fileName + "' in user's home is not readable");
         return null;
       }
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c48226473..e38808fd3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -190,4 +190,5 @@ dist-hook:
 	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f
 	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f
 	rm -f $(distdir)/../gnu/classpath/Configuration.java
+	rm -f $(distdir)/../gnu/java/security/Configuration.java
 	rm -f $(distdir)/../gnu/java/locale/LocaleData.java