From 9618a0ac4d523df1d7fbec9003c2208eb08997be Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 27 Jul 2011 01:00:50 -0600
Subject: [PATCH] Fix #814722 (Option to save .opf metadata as <meta> in epub.)

---
 src/calibre/ebooks/metadata/opf2.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 7ad741848e..35fd724ddd 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -1030,8 +1030,10 @@ class OPF(object): # {{{
             attrib = attrib or {}
             attrib['name'] = 'calibre:' + name
             name = '{%s}%s' % (self.NAMESPACES['opf'], 'meta')
+        nsmap = dict(self.NAMESPACES)
+        del nsmap['opf']
         elem = etree.SubElement(self.metadata, name, attrib=attrib,
-                                nsmap=self.NAMESPACES)
+                                nsmap=nsmap)
         elem.tail = '\n'
         return elem