diff --git a/src/constants.rs b/src/constants.rs
index 214e128..c8d6b8d 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -1,9 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication. See
-// for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/constants_32bit.rs b/src/constants_32bit.rs
index ac7c02e..88db84d 100644
--- a/src/constants_32bit.rs
+++ b/src/constants_32bit.rs
@@ -1,9 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication. See
-// for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/constants_64bit.rs b/src/constants_64bit.rs
index 90c81ab..046da20 100644
--- a/src/constants_64bit.rs
+++ b/src/constants_64bit.rs
@@ -1,9 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication. See
-// for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/decaf.rs b/src/decaf.rs
index d8ea97a..f8eb0c4 100644
--- a/src/decaf.rs
+++ b/src/decaf.rs
@@ -1,9 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication. See
-// for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/edwards.rs b/src/edwards.rs
index d0a13bd..2456954 100644
--- a/src/edwards.rs
+++ b/src/edwards.rs
@@ -1,9 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication. See
-// for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/field.rs b/src/field.rs
index 3fe0950..617adbc 100644
--- a/src/field.rs
+++ b/src/field.rs
@@ -1,10 +1,8 @@
-
+// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all
-// copyright and related or neighboring rights to curve25519-dalek,
-// using the Creative Commons "CC0" public domain dedication. See
-// for full
-// details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/field_32bit.rs b/src/field_32bit.rs
index 2c7aa74..ad85599 100644
--- a/src/field_32bit.rs
+++ b/src/field_32bit.rs
@@ -1,10 +1,8 @@
// -*- mode: rust; coding: utf-8; -*-
//
-// To the extent possible under law, the authors have waived all
-// copyright and related or neighboring rights to curve25519-dalek,
-// using the Creative Commons "CC0" public domain dedication. See
-// for full
-// details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/field_64bit.rs b/src/field_64bit.rs
index 2300a83..a4da3a0 100644
--- a/src/field_64bit.rs
+++ b/src/field_64bit.rs
@@ -1,10 +1,8 @@
// -*- mode: rust; coding: utf-8; -*-
//
-// To the extent possible under law, the authors have waived all
-// copyright and related or neighboring rights to curve25519-dalek,
-// using the Creative Commons "CC0" public domain dedication. See
-// for full
-// details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/lib.rs b/src/lib.rs
index 13da293..31c18ff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,13 +1,12 @@
-// -*- mode: rust; coding: utf-8; -*-
+// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication.
-// See for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
-// - Isis Agora Lovecruft
-// - Henry de Valence
+// - Isis Agora Lovecruft
+// - Henry de Valence
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(feature = "alloc", feature(alloc))]
diff --git a/src/montgomery.rs b/src/montgomery.rs
index d287eb7..29e1b20 100644
--- a/src/montgomery.rs
+++ b/src/montgomery.rs
@@ -1,9 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication. See
-// for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/scalar.rs b/src/scalar.rs
index be3cde2..876061d 100644
--- a/src/scalar.rs
+++ b/src/scalar.rs
@@ -1,10 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all
-// copyright and related or neighboring rights to curve25519-dalek,
-// using the Creative Commons "CC0" public domain dedication. See
-// for full
-// details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft
diff --git a/src/utils.rs b/src/utils.rs
index 34b5e10..3a31d79 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,9 +1,8 @@
// -*- mode: rust; -*-
//
-// To the extent possible under law, the authors have waived all copyright and
-// related or neighboring rights to curve25519-dalek, using the Creative
-// Commons "CC0" public domain dedication. See
-// for full details.
+// This file is part of curve25519-dalek.
+// Copyright (c) 2016-2017 Isis Lovecruft, Henry de Valence
+// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft