diff --git a/heka/files/heka.service b/heka/files/heka.service
index b32bf8e..386c12b 100644
--- a/heka/files/heka.service
+++ b/heka/files/heka.service
@@ -9,6 +9,7 @@
 EnvironmentFile=-/etc/default/{{ service_name }}
 User=heka
 Group=heka
+LimitNOFILE=102400
 ExecStart=/usr/bin/hekad -config=/etc/{{ service_name }}
 # NOT SURE HEKA doesn't support reloading by signal
 # ExecReload=/bin/kill -HUP $MAINPID
@@ -41,4 +42,4 @@
     exec start-stop-daemon --start  --chuid heka --exec /usr/local/bin/{{ service_name }}_wrapper 2>>/var/log/{{ service_name }}.log
 end script
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/heka/files/service_wrapper b/heka/files/service_wrapper
index f3532f1..df3b5c9 100644
--- a/heka/files/service_wrapper
+++ b/heka/files/service_wrapper
@@ -2,4 +2,5 @@
 
 HEKAD="/usr/bin/hekad"
 
+ulimit -n 102400
 exec $HEKAD -config=/etc/{{ service_name }}