diff --git a/httpbin/handlers_test.go b/httpbin/handlers_test.go
index 716dd697..fc5387d8 100644
--- a/httpbin/handlers_test.go
+++ b/httpbin/handlers_test.go
@@ -2707,6 +2707,13 @@ func TestBase64(t *testing.T) {
 			"/base64/decode/YWJjMTIzIT8kKiYoKSctPUB-",
 			"abc123!?$*&()'-=@~",
 		},
+		{
+			// Std base64 is also supported for decoding (+ instead of - in
+			// encoded input string). See also:
+			// https://github.com/mccutchen/go-httpbin/issues/152
+			"/base64/decode/8J+Ziywg8J+MjSEK4oCm",
+			"🙋, 🌍!\n…",
+		},
 		{
 			// URL-safe base64 is used for encoding (note the - instead of + in
 			// encoded output string)
@@ -2764,12 +2771,6 @@ func TestBase64(t *testing.T) {
 			"/base64/unknown/dmFsaWRfYmFzZTY0X2VuY29kZWRfc3RyaW5n",
 			"invalid operation: unknown",
 		},
-		{
-			// we only support URL-safe base64 encoded strings (note the +
-			// instead of - in encoded input string)
-			"/base64/decode/YWJjMTIzIT8kKiYoKSctPUB+",
-			"illegal base64 data",
-		},
 	}
 
 	for _, test := range errorTests {
diff --git a/httpbin/helpers.go b/httpbin/helpers.go
index c1e170f8..cff9b9cb 100644
--- a/httpbin/helpers.go
+++ b/httpbin/helpers.go
@@ -429,16 +429,20 @@ func newBase64Helper(path string) (*base64Helper, error) {
 	return &b, nil
 }
 
-// Encode - encode data as base64
+// Encode - encode data as URL-safe base64
 func (b *base64Helper) Encode() ([]byte, error) {
 	buff := make([]byte, base64.URLEncoding.EncodedLen(len(b.data)))
 	base64.URLEncoding.Encode(buff, []byte(b.data))
 	return buff, nil
 }
 
-// Decode - decode data from base64
+// Decode - decode data from base64, attempting both URL-safe and standard
+// encodings.
 func (b *base64Helper) Decode() ([]byte, error) {
-	return base64.URLEncoding.DecodeString(b.data)
+	if result, err := base64.URLEncoding.DecodeString(b.data); err == nil {
+		return result, nil
+	}
+	return base64.StdEncoding.DecodeString(b.data)
 }
 
 func wildCardToRegexp(pattern string) string {
diff --git a/httpbin/static/index.html b/httpbin/static/index.html
index 4d94d0b5..1599af8b 100644
--- a/httpbin/static/index.html
+++ b/httpbin/static/index.html
@@ -61,9 +61,9 @@ <h2 id="ENDPOINTS">ENDPOINTS</h2>
 <li><a href="/"><code>/</code></a> This page.</li>
 <li><a href="/absolute-redirect/6"><code>/absolute-redirect/:n</code></a> 302 Absolute redirects <em>n</em> times.</li>
 <li><a href="/anything"><code>/anything/:anything</code></a> Returns anything that is passed to request.</li>
-<li><a href="/base64/aHR0cGJpbmdvLm9yZw=="><code>/base64/:value</code></a> Decodes a Base64 encoded string.</li>
+<li><a href="/base64/aHR0cGJpbmdvLm9yZw=="><code>/base64/:value</code></a> Decodes a Base64-encoded string.</li>
 <li><a href="/base64/decode/aHR0cGJpbmdvLm9yZw=="><code>/base64/decode/:value</code></a> Explicit URL for decoding a Base64 encoded string.</li>
-<li><a href="/base64/encode/httpbingo.org"><code>/base64/encode/:value</code></a> Encodes a string into Base64.</li>
+<li><a href="/base64/encode/httpbingo.org"><code>/base64/encode/:value</code></a> Encodes a string into URL-safe Base64.</li>
 <li><a href="/basic-auth/user/passwd"><code>/basic-auth/:user/:passwd</code></a> Challenges HTTPBasic Auth.</li>
 <li><a href="/bearer"><code>/bearer</code></a> Checks Bearer token header - returns 401 if not set.</li>
 <li><a href="/brotli"><code><del>/brotli</del></code></a> Returns brotli-encoded data.</del> <i>Not implemented!</i></li>