diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 2b72f13..556a47d 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -187,6 +187,7 @@
 runtime/ftplugin/kdl.vim		@imsnif @jiangyinzuo
 runtime/ftplugin/kivy.vim		@ribru17
 runtime/ftplugin/kotlin.vim		@udalov
+runtime/ftplugin/ldapconf.vim		@ribru17
 runtime/ftplugin/less.vim		@genoma
 runtime/ftplugin/lex.vim		@ribru17
 runtime/ftplugin/liquid.vim		@tpope
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 77f209e..eb4e904 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1250,6 +1250,9 @@
 " LambdaProlog or SML (see dist#ft#FTmod for *.mod)
 au BufNewFile,BufRead *.sig			call dist#ft#FTsig()
 
+" LDAP configuration
+au BufNewFile,BufRead ldaprc,.ldaprc,ldap.conf	setf ldapconf
+
 " LDAP LDIF
 au BufNewFile,BufRead *.ldif			setf ldif
 
diff --git a/runtime/ftplugin/ldapconf.vim b/runtime/ftplugin/ldapconf.vim
new file mode 100644
index 0000000..7055716
--- /dev/null
+++ b/runtime/ftplugin/ldapconf.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	ldap.conf(5) configuration file.
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2024 Jul 06
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:# commentstring=#\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d6491be..2a9e6b4 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -385,6 +385,7 @@
     lace: ['file.ace', 'file.ACE'],
     latte: ['file.latte', 'file.lte'],
     ld: ['file.ld', 'any/usr/lib/aarch64-xilinx-linux/ldscripts/aarch64elf32b.x'],
+    ldapconf: ['ldap.conf', '.ldaprc', 'ldaprc'],
     ldif: ['file.ldif'],
     lean: ['file.lean'],
     ledger: ['file.ldg', 'file.ledger', 'file.journal'],
diff --git a/src/version.c b/src/version.c
index 6f7c2c0..536f840 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    544,
+/**/
     543,
 /**/
     542,