diff --git a/src/conf.py b/src/conf.py
index 027ae485c..d09a4811b 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -285,7 +285,7 @@ def timestamp(t):
     if t is None:
         t = time.time()
     t = time.localtime(t)
-    format = conf.get(supybot.reply.format.time, dynamic.channel)
+    format = get(supybot.reply.format.time, dynamic.channel)
     return time.strftime(format, t)
 utils.str.timestamp = timestamp
 
diff --git a/src/utils/str.py b/src/utils/str.py
index f96a813f1..38e70d419 100644
--- a/src/utils/str.py
+++ b/src/utils/str.py
@@ -338,7 +338,7 @@ def timestamp(t):
         t = time.time()
     return time.ctime(t)
 
-_formatRe = re.compile('%([bfhiLnpqstu%])')
+_formatRe = re.compile('%(\.\d+f|[bfhiLnpqstu%])')
 def format(s, *args, **kwargs):
     """w00t.
 
@@ -364,9 +364,8 @@ def format(s, *args, **kwargs):
         elif char == 'i':
             # XXX Improve me!
             return str(args.pop())
-        elif char == 'f':
-            # XXX Improve me!
-            return str(args.pop())
+        elif char.endswith('f'):
+            return ('%'+char) % args.pop()
         elif char == 'b':
             return be(args.pop())
         elif char == 'h':
diff --git a/test/test_format.py b/test/test_format.py
new file mode 100644
index 000000000..a63c4fdee
--- /dev/null
+++ b/test/test_format.py
@@ -0,0 +1,40 @@
+###
+# Copyright (c) 2005, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from supybot.test import *
+
+class FormatTestCase(SupyTestCase):
+    def test_t_acceptsNone(self):
+        self.failUnless(format('%t', None))
+
+    def testFloatingPoint(self):
+        self.assertEqual(format('%.2f', 0.12345), '0.12')
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: