diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 8f56bbf2ea8..9b973a702b1 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.18.0'
+__version__ = '6.18.1'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index a1c369e760b..4a70112fd44 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.18.0"
+app_version = "6.18.1"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index 623e352a1d1..e201176befe 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -22,7 +22,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Short Name", 
-   "length": 10, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -221,4 +221,4 @@
  "sort_field": "", 
  "sort_order": "DESC", 
  "title_field": "short_name"
-}
\ No newline at end of file
+}
diff --git a/setup.py b/setup.py
index 9246a012cd2..b8b75ba0357 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.18.0"
+version = "6.18.1"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(