diff --git a/spki/ChangeLog b/spki/ChangeLog
index 95ca461a51737cabd1a61769af65c86f5320f08d..c7f69c88dc3365eedec2107ecf2329bfd3494a60 100644
--- a/spki/ChangeLog
+++ b/spki/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-13  Niels Möller  <nisse@lysator.liu.se>
 
+	* Fixed copyright headers on many files, used to say "The nettle
+	library is free software". Now refers to the "libspki library"
+	instead.
+
 	* configure.ac: Deleted left over check of $am_cv_prog_cc_stdc.
 
 2010-12-14  Niels Möller  <nisse@lysator.liu.se>
diff --git a/spki/certificate.c b/spki/certificate.c
index b3c878a27ff8ce6107c1fce3f077e706b8c2cfe6..b68ada72f087f02b4ee2087074233677703a2dbf 100644
--- a/spki/certificate.c
+++ b/spki/certificate.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/certificate.h b/spki/certificate.h
index 0e0fb581a08782090a8bf91b9bc6be56a3062f42..014f62c6748cac282352d24703fdbd972bb91883 100644
--- a/spki/certificate.h
+++ b/spki/certificate.h
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/names.c b/spki/names.c
index 17920433cb63c26082f9d48804f6296bfca7bce3..5d5384e0ff8e5aadd48ee9c6cdd5d03798ff4456 100644
--- a/spki/names.c
+++ b/spki/names.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/parse-transport.c b/spki/parse-transport.c
index 790a44ca9a82e5a42d0145b3ac22f2c5addd7f69..911abf18424d73cf062b06afa0f8e41f1ec3ba8c 100644
--- a/spki/parse-transport.c
+++ b/spki/parse-transport.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/parse.c b/spki/parse.c
index eac6a17b1b3a556c5d7510a58da50eb0b233c196..5ce7b3c19ac0df79855fb3a98795d92905b76e1f 100644
--- a/spki/parse.c
+++ b/spki/parse.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/parse.h b/spki/parse.h
index 7ddcab1f0d4f47dd84d6eabade8d212a62d76910..ee13c55029305b6317958b9cd2560c0149a04efc 100644
--- a/spki/parse.h
+++ b/spki/parse.h
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/reduce.c b/spki/reduce.c
index 2f60a010a7f401553fbc0dd634a459b3c45fd5e4..b21d3badd5c9162e005a69f0953f88f9bb61b3a2 100644
--- a/spki/reduce.c
+++ b/spki/reduce.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tag.c b/spki/tag.c
index 24b3535827139582b0e88d2dee6a2111e6e40999..e2a9228a4479b2178b3275ee12654c426ce3d7ea 100644
--- a/spki/tag.c
+++ b/spki/tag.c
@@ -6,18 +6,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tag.h b/spki/tag.h
index 6a51c212a72d9c0855d3bf44cb7698c200833445..5f84449980937d023bf6345eaf71f1dda1c45866 100644
--- a/spki/tag.h
+++ b/spki/tag.h
@@ -6,18 +6,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tools/misc.c b/spki/tools/misc.c
index 4e6bbae071c51f8255dd6b4ce0463e5100873dc7..d767c50d148e51da6ed48775affb6fac832e66e5 100644
--- a/spki/tools/misc.c
+++ b/spki/tools/misc.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2003 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tools/misc.h b/spki/tools/misc.h
index 116e75c973c0438b0ff3fbb0aa07b8fa33e13856..038e0f2667ef0c431a3a9cbfaf931518912b4dd3 100644
--- a/spki/tools/misc.h
+++ b/spki/tools/misc.h
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2003 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tools/sign.h b/spki/tools/sign.h
index ce18ebbe7ae5f14d93ab43aea080bb3870822617..e7a0db3797bae8a6c79bffe44eee1d2303b42f6f 100644
--- a/spki/tools/sign.h
+++ b/spki/tools/sign.h
@@ -6,18 +6,18 @@
  *
  * Copyright (C) 2003 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tools/spki-check-signature.c b/spki/tools/spki-check-signature.c
index 0297ce446824b18d0e348f1334a26e4807778504..1650cfcac9e848c854d156afa6728c6e7b05b14e 100644
--- a/spki/tools/spki-check-signature.c
+++ b/spki/tools/spki-check-signature.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2003 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tools/spki-delegate.c b/spki/tools/spki-delegate.c
index b68773318ddc7e2e4aa700a7f4e9314d6a052427..fb7a67c3fb3fed35b55e5c3a10d3e423c7077611 100644
--- a/spki/tools/spki-delegate.c
+++ b/spki/tools/spki-delegate.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2003 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tools/spki-make-signature.c b/spki/tools/spki-make-signature.c
index ee275bb2f4c8abaa121dabc1eb5fbc3fb066e3e5..40d886d30398bace2991d6fd59adddd8484b5fc4 100644
--- a/spki/tools/spki-make-signature.c
+++ b/spki/tools/spki-make-signature.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2003 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/tools/spki-reduce.c b/spki/tools/spki-reduce.c
index 740599ffb14ea1c23658e662e5038ad4a86d3d30..180b593d17ee3deb5baf0c27263654453023f5b3 100644
--- a/spki/tools/spki-reduce.c
+++ b/spki/tools/spki-reduce.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2003 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
diff --git a/spki/verify.c b/spki/verify.c
index a2a47b40c082de18ce81984051bffaa3f7c64ea5..e56c57e36b7f81666003fed1e77ff974b05f4a93 100644
--- a/spki/verify.c
+++ b/spki/verify.c
@@ -4,18 +4,18 @@
  *
  * Copyright (C) 2002 Niels Möller
  *  
- * The nettle library is free software; you can redistribute it and/or modify
+ * The libspki library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at your
  * option) any later version.
  * 
- * The nettle library is distributed in the hope that it will be useful, but
+ * The libspki library 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 Lesser General Public
  * License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * along with the libspki library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */