diff --git a/doc/Changelog b/doc/Changelog
index ff2b195a7..c107b413e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+24 August 2011: Wouter
+	- Applied patch from Karel Slany that fixes a memory leak in the
+	  unbound python module, in string conversions.
+
 22 August 2011: Wouter
 	- Fix validation of qtype ANY responses with CNAMEs (thanks Cathy
 	  Zhang and Luo Ce).  Unbound responds with the RR types that are
diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index ca2ae1671..7d3739ab2 100644
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -868,6 +868,15 @@ void log_dns_msg(const char* str, struct query_info* qinfo, struct reply_info* r
 void log_query_info(enum verbosity_value v, const char* str, struct query_info* qinf);
 void regional_log_stats(struct regional *r);
 
+// Free allocated memory from marked sources returning corresponding types
+%typemap(newfree, noblock = 1) char * {
+  free($1);
+}
+
+// Mark as source returning newly allocated memory
+%newobject ldns_rr_type2str;
+%newobject ldns_rr_class2str;
+
 // LDNS functions
 char *ldns_rr_type2str(const uint16_t atype);
 char *ldns_rr_class2str(const uint16_t aclass);