diff --git a/lib/puppet/type/openldap_database.rb b/lib/puppet/type/openldap_database.rb
index 1ca1c165..e55bc010 100644
--- a/lib/puppet/type/openldap_database.rb
+++ b/lib/puppet/type/openldap_database.rb
@@ -11,13 +11,7 @@
   newparam(:suffix, namevar: true) do
     desc 'The default namevar.'
     validate do |value|
-      raise ArgumentError, 'Invalid value' unless [
-        /\Acn=config\z/,
-        /\Acn=monitor\z/,
-        %r{\A(dc|o)=[[:alnum:].-]+(,(dc|o)=[[:alnum:].-]+)*\z},
-      ].any? do |pattern|
-        pattern.match?(value)
-      end
+      raise ArgumentError, 'Invalid value' unless value.match?(%r{\A[[:alnum:]]+=[^,;]+([,;][[:alnum:]]+=[^,;]+)*\z})
     end
   end
 
diff --git a/spec/unit/puppet/type/openldap_database_spec.rb b/spec/unit/puppet/type/openldap_database_spec.rb
index ce4222bb..41550466 100644
--- a/spec/unit/puppet/type/openldap_database_spec.rb
+++ b/spec/unit/puppet/type/openldap_database_spec.rb
@@ -17,14 +17,21 @@
 
     it 'does not invalid suffixes' do
       expect { described_class.new(name: 'foo bar') }.to raise_error(Puppet::Error, %r{Invalid value})
-      expect { described_class.new(name: 'cn=admin,dc=example,dc=com') }.to raise_error(Puppet::Error, %r{Invalid value})
-      expect { described_class.new(name: 'dc=example, dc=com') }.to raise_error(Puppet::Error, %r{Invalid value})
+      expect { described_class.new(name: 'cn=foo,bar') }.to raise_error(Puppet::Error, %r{Invalid value})
+      expect { described_class.new(name: 'foo,cn=bar') }.to raise_error(Puppet::Error, %r{Invalid value})
+      expect { described_class.new(name: 'cn=foo,,cn=bar') }.to raise_error(Puppet::Error, %r{Invalid value})
     end
 
     it 'allows valid suffix' do
       expect { described_class.new(name: 'dc=example,dc=com') }.not_to raise_error
+      expect { described_class.new(name: 'dc=foo;dc=bar') }.not_to raise_error
       expect { described_class.new(name: 'cn=config') }.not_to raise_error
     end
+
+    it 'allows more valid suffix', skip: 'These are valid DNs, but we need a proper parser to match them, not a regexp' do
+      expect { described_class.new(name: 'OU=Sales+CN=J. Smith,O=Widget Inc.,C=US') }.not_to raise_error
+      expect { described_class.new(name: 'CN=R. Smith,O=Big Company\\, Inc.,C=US') }.not_to raise_error
+    end
   end
 
   describe 'when validating attributes' do