diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..5a21153
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) Daniel Wagner
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+!! This software is provided by the regents and contributors ``as is'' and
+!! any express or implied warranties, including, but not limited to, the
+!! implied warranties of merchantability and fitness for a particular purpose
+!! are disclaimed.  In no event shall the authors or contributors be liable
+!! for any direct, indirect, incidental, special, exemplary, or consequential
+!! damages (including, but not limited to, procurement of substitute goods
+!! or services; loss of use, data, or profits; or business interruption)
+!! however caused and on any theory of liability, whether in contract, strict
+!! liability, or tort (including negligence or otherwise) arising in any way
+!! out of the use of this software, even if advised of the possibility of
+!! such damage.
diff --git a/encoding.cabal b/encoding.cabal
index 24b0b8a..d31e15d 100644
--- a/encoding.cabal
+++ b/encoding.cabal
@@ -3,12 +3,13 @@ Version:	0.6.7
 Author:		Henning Günther
 Maintainer:	daniel@wagner-home.com
 License:	BSD3
+License-File:   LICENSE
 Synopsis:	A library for various character encodings
 Description:
 	Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
 Category:	Codec
 Homepage:	http://code.haskell.org/encoding/
-Cabal-Version:	>=1.2
+Cabal-Version:	>=1.6
 Build-Type:	Custom
 Extra-Source-Files:
   NEWS
@@ -28,6 +29,15 @@ Flag newGHC
 Flag systemEncoding
   description: Provide the getSystemEncoding action to query the locale.
 
+Source-Repository head
+  Type:			darcs
+  Location:		http://community.haskell.org/encoding
+
+Source-Repository this
+  Type:			darcs
+  Location:		http://community.haskell.org/encoding
+  Tag:			0.6.7
+
 Library
   Build-Depends:	binary, extensible-exceptions, HaXml >= 1.22 && < 1.24
   if flag(splitBase)