diff --git a/doc/changelog.qbk b/doc/changelog.qbk
index 2dd926a..c13a15b 100644
--- a/doc/changelog.qbk
+++ b/doc/changelog.qbk
@@ -12,6 +12,7 @@ Not yet released
 
 * Dropped support for obsolete Boost.Phoenix V2
 * Added support for multiple parameters constraints
+* Added inline to generated MOCK_FUNCTION
 
 [section 1.2.6]
 Released 24 May 2014
diff --git a/include/turtle/mock.hpp b/include/turtle/mock.hpp
index 49142c9..a120650 100644
--- a/include/turtle/mock.hpp
+++ b/include/turtle/mock.hpp
@@ -163,7 +163,7 @@
 
 #define MOCK_FUNCTION_AUX(F, n, S, t, s, tpn) \
     MOCK_FUNCTION_HELPER(S, t, s, tpn) \
-    s MOCK_DECL(F, n, S,,tpn) \
+    s inline MOCK_DECL(F, n, S,,tpn) \
     { \
         BOOST_MPL_ASSERT_RELATION( n, ==, \
             boost::function_types::function_arity< \
@@ -212,7 +212,8 @@
 #define MOCK_STATIC_METHOD(F, n, ...) \
     MOCK_FUNCTION_AUX(F, n, \
         MOCK_VARIADIC_ELEM_0(__VA_ARGS__), \
-        MOCK_VARIADIC_ELEM_1(__VA_ARGS__, F), static,)
+        MOCK_VARIADIC_ELEM_1(__VA_ARGS__, F), \
+        static,)
 
 #define MOCK_STATIC_METHOD_TPL(F, n, ...) \
     MOCK_FUNCTION_AUX(F, n, \