diff --git a/plugins/FunDB.py b/plugins/FunDB.py
index 3fe858673..deb0a4f00 100755
--- a/plugins/FunDB.py
+++ b/plugins/FunDB.py
@@ -402,6 +402,7 @@ class FunDB(callbacks.Privmsg, configurable.Mixin, plugins.ChannelDBHandler):
         except ValueError:
             nick = ' '.join([id, nick]).strip()
             id = 0
+        nick = nick.rstrip('.')
         if not nick:
             raise callbacks.ArgumentError
         if nick == irc.nick:
@@ -457,6 +458,7 @@ class FunDB(callbacks.Privmsg, configurable.Mixin, plugins.ChannelDBHandler):
         except ValueError:
             nick = ' '.join([id, nick]).strip()
             id = 0
+        nick = nick.rstrip('.')
         if not nick:
             raise callbacks.ArgumentError
         try:
diff --git a/test/test_FunDB.py b/test/test_FunDB.py
index a20f5583e..3629cdfe8 100644
--- a/test/test_FunDB.py
+++ b/test/test_FunDB.py
@@ -86,6 +86,11 @@ if sqlite is not None:
             self.assertRegexp('num lart', 'currently 0')
             self.assertError('lart jemfinch')
 
+        def testLartAndPraiseRemoveTrailingPeriods(self):
+            for s in ['lart', 'praise']:
+                self.assertNotError('add %s $who foo!' % s)
+                self.assertAction('%s bar.' % s, 'bar foo!')
+
         def testMyMeReplacement(self):
             self.assertNotError('add lart jabs $who')
             self.assertNotError('add praise pets $who')