diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 2274e69..51437b2 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -31,3 +31,7 @@ path = "fuzz_targets/deserialize_script.rs"
 [[bin]]
 name = "deserialize_transaction"
 path = "fuzz_targets/deserialize_transaction.rs"
+
+[[bin]]
+name = "deserialize_address"
+path = "fuzz_targets/deserialize_address.rs"
diff --git a/fuzz/fuzz_targets/deserialize_address.rs b/fuzz/fuzz_targets/deserialize_address.rs
new file mode 100644
index 0000000..9bb71fe
--- /dev/null
+++ b/fuzz/fuzz_targets/deserialize_address.rs
@@ -0,0 +1,57 @@
+extern crate bitcoin;
+use std::str::FromStr;
+fn do_test(data: &[u8]) {
+    let data_str = String::from_utf8_lossy(data);
+    let addr = match bitcoin::util::address::Address::from_str(&data_str) {
+        Ok(addr) => addr,
+        Err(_) => return,
+    };
+    assert_eq!(addr.to_string(), data_str);
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+    afl::read_stdio_bytes(|data| {
+        do_test(&data);
+    });
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+    loop {
+        fuzz!(|data| {
+            do_test(data);
+        });
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+        let mut b = 0;
+        for (idx, c) in hex.as_bytes().iter().enumerate() {
+            b <<= 4;
+            match *c {
+                b'A'...b'F' => b |= c - b'A' + 10,
+                b'a'...b'f' => b |= c - b'a' + 10,
+                b'0'...b'9' => b |= c - b'0',
+                _ => panic!("Bad hex"),
+            }
+            if (idx & 1) == 1 {
+                out.push(b);
+                b = 0;
+            }
+        }
+    }
+
+    #[test]
+    fn duplicate_crash() {
+        let mut a = Vec::new();
+        extend_vec_from_hex("00000000", &mut a);
+        super::do_test(&a);
+    }
+}