diff --git a/lang/cpp/src/data.cpp b/lang/cpp/src/data.cpp
index 84ed336d..2cb4fa88 100644
--- a/lang/cpp/src/data.cpp
+++ b/lang/cpp/src/data.cpp
@@ -161,6 +161,9 @@ GpgME::Data::Encoding GpgME::Data::encoding() const
     case GPGME_DATA_ENCODING_BASE64: return Base64Encoding;
     case GPGME_DATA_ENCODING_ARMOR:  return ArmorEncoding;
     case GPGME_DATA_ENCODING_MIME:   return MimeEncoding;
+    case GPGME_DATA_ENCODING_URL:    return UrlEncoding;
+    case GPGME_DATA_ENCODING_URLESC: return UrlEscEncoding;
+    case GPGME_DATA_ENCODING_URL0:   return Url0Encoding;
     }
     return AutoEncoding;
 }
@@ -174,6 +177,9 @@ GpgME::Error GpgME::Data::setEncoding(Encoding enc)
     case Base64Encoding: ge = GPGME_DATA_ENCODING_BASE64; break;
     case ArmorEncoding:  ge = GPGME_DATA_ENCODING_ARMOR;  break;
     case MimeEncoding:   ge = GPGME_DATA_ENCODING_MIME;  break;
+    case UrlEncoding:    ge = GPGME_DATA_ENCODING_URL; break;
+    case UrlEscEncoding: ge = GPGME_DATA_ENCODING_URLESC; break;
+    case Url0Encoding:   ge = GPGME_DATA_ENCODING_URL0; break;
     }
     return Error(gpgme_data_set_encoding(d->data, ge));
 }
diff --git a/lang/cpp/src/data.h b/lang/cpp/src/data.h
index b2f2173f..50bdf627 100644
--- a/lang/cpp/src/data.h
+++ b/lang/cpp/src/data.h
@@ -78,7 +78,10 @@ public:
         BinaryEncoding,
         Base64Encoding,
         ArmorEncoding,
-        MimeEncoding
+        MimeEncoding,
+        UrlEncoding,
+        UrlEscEncoding,
+        Url0Encoding,
     };
     Encoding encoding() const;
     Error setEncoding(Encoding encoding);