diff --git a/HISTORY.rst b/HISTORY.rst
index 90e25264..c2e54e39 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -23,6 +23,9 @@ PlatformIO 2.0
   (`IDE issue #34 <https://github.com/platformio/platformio-atom-ide/issues/34>`_)
 * Fixed unable to link C++ standard library to Espressif platform build
   (`issue #503 <https://github.com/platformio/platformio/issues/503>`_)
+* Fixed issue with pointer (``char* myfunc()``) while converting from ``*.ino``
+  to ``*.cpp``
+  (`issue #506 <https://github.com/platformio/platformio/issues/506>`_)
 
 2.8.3 (2016-02-02)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index 018ad7f7..f6c38555 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -27,7 +27,7 @@ class InoToCPPConverter(object):
 
     PROTOTYPE_RE = re.compile(
         r"""^(
-        (\s*[a-z_\d]+){1,2}         # return type
+        (\s*[a-z_\d]+\*?){1,2}      # return type
         (\s+[a-z_\d]+\s*)           # name of prototype
         \([a-z_,\.\*\&\[\]\s\d]*\)  # arguments
         )\s*\{                      # must end with {