diff --git a/rhodecode/lib/codeblocks.py b/rhodecode/lib/codeblocks.py
--- a/rhodecode/lib/codeblocks.py
+++ b/rhodecode/lib/codeblocks.py
@@ -20,6 +20,7 @@
 
 import logging
 import difflib
+import string
 from itertools import groupby
 
 from pygments import lex
@@ -28,11 +29,11 @@ from pygments.lexers.special import Text
 
 from rhodecode.lib.helpers import (
     get_lexer_for_filenode, html_escape, get_custom_lexer)
-from rhodecode.lib.utils2 import AttributeDict, StrictAttributeDict
+from rhodecode.lib.utils2 import AttributeDict, StrictAttributeDict, safe_unicode
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.lib.vcs.exceptions import VCSError, NodeDoesNotExistError
 from rhodecode.lib.diff_match_patch import diff_match_patch
-from rhodecode.lib.diffs import LimitedDiffContainer
+from rhodecode.lib.diffs import LimitedDiffContainer, DEL_FILENODE, BIN_FILENODE
 from pygments.lexers import get_lexer_by_name
 
 plain_text_lexer = get_lexer_by_name(
@@ -506,6 +507,7 @@ class DiffSet(object):
             'target_mode': patch['stats']['new_mode'],
             'limited_diff': isinstance(patch, LimitedDiffContainer),
             'hunks': [],
+            'hunk_ops': None,
             'diffset': self,
         })
 
@@ -515,6 +517,30 @@ class DiffSet(object):
             hunkbit.target_file_path = target_file_path
             filediff.hunks.append(hunkbit)
 
+        # Simulate hunk on OPS type line which doesn't really contain any diff
+        # this allows commenting on those
+        actions = []
+        for op_id, op_text in filediff.patch['stats']['ops'].items():
+            if op_id == DEL_FILENODE:
+                actions.append(u'file was deleted')
+            elif op_id == BIN_FILENODE:
+                actions.append(u'binary diff hidden')
+            else:
+                actions.append(safe_unicode(op_text))
+        action_line = u'FILE WITHOUT CONTENT: ' + \
+                      u', '.join(map(string.upper, actions)) or u'UNDEFINED_ACTION'
+
+        hunk_ops = {'source_length': 0, 'source_start': 0,
+                    'lines': [
+                        {'new_lineno': 0, 'old_lineno': 1,
+                         'action': 'unmod', 'line': action_line}
+                    ],
+                    'section_header': u'', 'target_start': 1, 'target_length': 1}
+
+        hunkbit = self.parse_hunk(hunk_ops, source_file, target_file)
+        hunkbit.source_file_path = source_file_path
+        hunkbit.target_file_path = target_file_path
+        filediff.hunk_ops = hunkbit
         return filediff
 
     def parse_hunk(self, hunk, source_file, target_file):
diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -149,42 +149,37 @@ collapse_all = len(diffset.files) > coll
         lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted']
         over_lines_changed_limit = lines_changed > lines_changed_limit
         %>
-        <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
+
+        <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
         <div
             class="filediff"
             data-f-path="${filediff.patch['filename']}"
-            id="a_${h.FID('', filediff.patch['filename'])}">
-            <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
-                <div class="filediff-collapse-indicator"></div>
-                ${diff_ops(filediff)}
-            </label>
-            ${diff_menu(filediff, use_comments=use_comments)}
-            <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
-        %if not filediff.hunks:
-            %for op_id, op_text in filediff.patch['stats']['ops'].items():
-                <tr>
-                    <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
-                        %if op_id == DEL_FILENODE:
-                        ${_('File was deleted')}
-                        %elif op_id == BIN_FILENODE:
-                        ${_('Binary file hidden')}
-                        %else:
-                        ${op_text}
-                        %endif
-                    </td>
-                </tr>
-            %endfor
-        %endif
+            id="a_${h.FID('', filediff.patch['filename'])}"
+        >
+
+        <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
+            <div class="filediff-collapse-indicator"></div>
+            ${diff_ops(filediff)}
+        </label>
+        ${diff_menu(filediff, use_comments=use_comments)}
+        <table class="cb cb-diff-${c.diffmode} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
+
+        ## new/deleted/empty content case
+        % if not filediff.hunks:
+            ## Comment container, on "fakes" hunk that contains all data to render comments
+            ${render_hunk_lines(c.diffmode, filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments)}
+        % endif
+
         %if filediff.limited_diff:
                 <tr class="cb-warning cb-collapser">
-                    <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
+                    <td class="cb-text" ${(c.diffmode == 'unified' and 'colspan=4' or 'colspan=6')}>
                         ${_('The requested commit is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
                     </td>
                 </tr>
         %else:
             %if over_lines_changed_limit:
                     <tr class="cb-warning cb-collapser">
-                        <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
+                        <td class="cb-text" ${(c.diffmode == 'unified' and 'colspan=4' or 'colspan=6')}>
                             ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
                             <a href="#" class="cb-expand"
                                onclick="$(this).closest('table').removeClass('cb-collapsed'); return false;">${_('Show them')}
@@ -197,31 +192,23 @@ collapse_all = len(diffset.files) > coll
             %endif
         %endif
 
-        %for hunk in filediff.hunks:
-                <tr class="cb-hunk">
-                    <td ${c.diffmode == 'unified' and 'colspan=3' or ''}>
-                        ## TODO: dan: add ajax loading of more context here
-                        ## <a href="#">
-                            <i class="icon-more"></i>
-                        ## </a>
-                    </td>
-                    <td ${c.diffmode == 'sideside' and 'colspan=5' or ''}>
-                        @@
-                        -${hunk.source_start},${hunk.source_length}
-                        +${hunk.target_start},${hunk.target_length}
-                        ${hunk.section_header}
-                    </td>
-                </tr>
-            %if c.diffmode == 'unified':
-                    ${render_hunk_lines_unified(hunk, use_comments=use_comments, inline_comments=inline_comments)}
-            %elif c.diffmode == 'sideside':
-                    ${render_hunk_lines_sideside(hunk, use_comments=use_comments, inline_comments=inline_comments)}
-            %else:
-                <tr class="cb-line">
-                    <td>unknown diff mode</td>
-                </tr>
-            %endif
-        %endfor
+        % for hunk in filediff.hunks:
+            <tr class="cb-hunk">
+                <td ${(c.diffmode == 'unified' and 'colspan=3' or '')}>
+                    ## TODO: dan: add ajax loading of more context here
+                    ## <a href="#">
+                        <i class="icon-more"></i>
+                    ## </a>
+                </td>
+                <td ${(c.diffmode == 'sideside' and 'colspan=5' or '')}>
+                    @@
+                    -${hunk.source_start},${hunk.source_length}
+                    +${hunk.target_start},${hunk.target_length}
+                    ${hunk.section_header}
+                </td>
+            </tr>
+            ${render_hunk_lines(c.diffmode, hunk, use_comments=use_comments, inline_comments=inline_comments)}
+        % endfor
 
         <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
 
@@ -292,7 +279,7 @@ collapse_all = len(diffset.files) > coll
                 display_state = ''
         %>
         <div class="filediffs filediff-outdated" style="${display_state}">
-            <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
+            <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
             <div class="filediff" data-f-path="${filename}"  id="a_${h.FID('', filename)}">
                 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
                     <div class="filediff-collapse-indicator"></div>
@@ -714,6 +701,20 @@ def get_comments_for(diff_type, comments
     %endfor
 </%def>
 
+
+<%def name="render_hunk_lines(diff_mode, hunk, use_comments, inline_comments)">
+    % if diff_mode == 'unified':
+        ${render_hunk_lines_unified(hunk, use_comments=use_comments, inline_comments=inline_comments)}
+    % elif diff_mode == 'sideside':
+        ${render_hunk_lines_sideside(hunk, use_comments=use_comments, inline_comments=inline_comments)}
+    % else:
+        <tr class="cb-line">
+            <td>unknown diff mode</td>
+        </tr>
+    % endif
+</%def>
+
+
 <%def name="render_add_comment_button()">
 <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
     <span><i class="icon-comment"></i></span>