diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbd7a72..5b2fa7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [Unreleased]
+
+### Added
+- Wildcard certificates are now supported. In the file name, the `*` is replaced by `_`.
+
 ## [0.6.1] - 2019-09-13
 
 ### Fixed
diff --git a/acmed/src/config.rs b/acmed/src/config.rs
index 65611f2..8aba14f 100644
--- a/acmed/src/config.rs
+++ b/acmed/src/config.rs
@@ -300,7 +300,7 @@ impl Certificate {
         match &self.name {
             Some(n) => n.to_string(),
             None => self.domains.first().unwrap().dns.to_owned(),
-        }
+        }.replace("*", "_")
     }
 
     pub fn get_crt_name_format(&self) -> String {