diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index a75c4be..3ac7fab 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -893,3 +893,25 @@ span.CONFLICTS {
 #pr_flags table tr{
     margin-bottom: 1em;
 }
+
+.textAreaLine {
+    width: 950px;
+    overflow: hidden;
+    position: relative;
+    text-indent: 1em;
+}
+
+.lineNum {
+    left: 0;
+    position: absolute;
+    text-align: right;
+    top: 0;
+    width: 27px;
+    font-size: 92.3%;
+    line-height: 100%;
+}
+
+#commit {
+    padding-top: 2em;
+    padding-left: 2em;
+}
diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html
new file mode 100644
index 0000000..d8c6bbe
--- /dev/null
+++ b/pagure/templates/edit_file.html
@@ -0,0 +1,112 @@
+{% extends "repo_master.html" %}
+{% from "_formhelper.html" import render_field %}
+
+{% block title %}Edit - {{ repo.name }}{% endblock %}
+{%block tag %}home{% endblock %}
+
+
+{% block repo %}
+
+<h2>
+    <a href="{{ url_for('view_tree', username=username,
+                repo=repo.name, identifier=branchname)
+    }}">{{ branchname }}</a>/{%
+  for file in filename.split('/') %}
+    {% if loop.first %}
+    {% set path = file %}
+    {% else %}
+    {% set path = path + '/' + file %}
+    {% endif %}
+    {% if loop.index != loop.length %}<a
+    href="{{ url_for('view_file', username=username,
+            repo=repo.name, identifier=branchname,
+            filename=path)}}"
+      >{{ file }}</a>/{% else %}{{ file }}{% endif %}
+  {% endfor %}
+</h2>
+
+<form action="{{ url_for(
+      'edit_file', username=username, repo=repo.name,
+      branchname=branchname, filename=filename) }}"
+      method="post">
+{{ form.csrf_token }}
+
+<div id="lineNum"></div>
+<textarea cols="140" rows="{{
+    data.split('\n') | length + 1
+    if data.split('\n') | length < 30
+    else 30 }} " id="textareaCode" name="content">
+{{ data }}
+</textarea>
+
+<div id="commit">
+  <div>
+    <input type="text" id="commit_title" name="commit_title"
+        placeholder="Update {{ filename }}"
+        value="{{ form.commit_title.data if form.commit_title.data }}">
+    </input>
+  </div>
+  <div>
+    <textarea rows="5" cols="85" type="text" id="commit_message"
+        name="commit_message"
+        placeholder="An optional description of the change">
+    {{- form.commit_message.data if form.commit_message.data -}}
+    </textarea>
+  </div>
+  <div>
+    <input type="submit" class="submit positive button" value="Commit changes">
+    <input type="button" value="Clear" id="clear_comment" />
+  </div>
+</div>
+
+</form>
+
+{% endblock %}
+
+{% block jscripts %}
+{{ super() }}
+<script type="text/javascript">
+$( "#clear_comment").click(
+  function() {
+    $( "#commit_message" ).val("");
+  }
+);
+
+var lineObjOffsetTop = 0;
+
+function createTextAreaWithLines(id) {
+  var el = document.getElementById('lineNum');
+  var ta = document.getElementById(id);
+  el.appendChild(ta);
+  el.className='textAreaLine';
+  el.style.height = (ta.offsetHeight + 2) + 'px';
+  ta.style.position = 'absolute';
+  ta.style.left = '30px';
+  var lineObj = document.createElement('div');
+  el.insertBefore(lineObj,ta);
+  lineObj.className='lineNum';
+  var str = '';
+  var _len = ($('#textareaCode').val()).split(/\r*\n/).length;
+  for(var no=1; no < _len; no++){
+     if(str.length>0) {
+        str = str + '<br>';
+    }
+     str = str + no;
+  }
+
+  ta.onkeydown = function() { update_lines(lineObj,ta); };
+  ta.onmousedown = function() { update_lines(lineObj,ta); };
+  ta.onscroll = function() { update_lines(lineObj,ta); };
+  ta.onblur = function() { update_lines(lineObj,ta); };
+  ta.onfocus = function() { update_lines(lineObj,ta); };
+  ta.onmouseover = function() { update_lines(lineObj,ta); };
+  lineObj.innerHTML = str;
+}
+
+function update_lines(obj,ta) {
+  obj.style.top = (ta.scrollTop * -1 + lineObjOffsetTop) + 'px';
+}
+
+createTextAreaWithLines('textareaCode');
+</script>
+{% endblock %}
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index c55bea8..c9bc121 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -1131,3 +1131,82 @@ def revoke_api_token(repo, token_id, username=None):
         flask.url_for(
             '.view_settings', repo=repo.name, username=username)
     )
+
+
+@APP.route(
+    '/<repo>/edit/<path:branchname>/f/<path:filename>',
+    methods=('GET', 'POST'))
+@APP.route(
+    '/fork/<username>/<repo>/edit/<path:branchname>/f/<path:filename>',
+    methods=('GET', 'POST'))
+@cla_required
+def edit_file(repo, branchname, filename, username=None):
+    """ Edit a file online.
+    """
+    repo = pagure.lib.get_project(SESSION, repo, user=username)
+
+    if not repo:
+        flask.abort(404, 'Project not found')
+
+    if not is_repo_admin(repo):
+        flask.abort(
+            403,
+            'You are not allowed to change the settings for this project')
+
+    reponame = pagure.get_repo_path(repo)
+
+    repo_obj = pygit2.Repository(reponame)
+
+    if repo_obj.is_empty:
+        flask.abort(404, 'Empty repo cannot have a file')
+
+    branch = None
+    if branchname in repo_obj.listall_branches():
+        branch = repo_obj.lookup_branch(branchname)
+        commit = branch.get_object()
+    else:
+        flask.abort(400, 'Invalid branch specified')
+
+    form = pagure.forms.EditFileForm()
+    if form.validate_on_submit():
+        try:
+            pagure.lib.git.update_file_in_git(
+                repo,
+                branch=branchname,
+                filename=filename,
+                content=form.content.data,
+                message='%s\n\n%s' % (
+                    form.commit_title.data.strip(),
+                    form.commit_message.data.strip()
+                ),
+                user=flask.g.fas_user
+            )
+
+            return flask.redirect(
+                flask.url_for(
+                    '.view_file', repo=repo.name, username=username,
+                    identifier=branchname, filename=filename)
+            )
+        except pagure.exceptions.PagureException as err:  # pragma: no cover
+            APP.logger.exception(err)
+            flask.flash('Commit could not be done', 'error')
+            data = form.content.data
+    elif flask.request.method == 'GET':
+        content = __get_file_in_tree(
+            repo_obj, commit.tree, filename.split('/'))
+        if not content or isinstance(content, pygit2.Tree):
+            flask.abort(404, 'File not found')
+        data = repo_obj[content.oid].data
+    else:
+        data = form.content.data
+
+    return flask.render_template(
+        'edit_file.html',
+        select='tree',
+        repo=repo,
+        username=username,
+        branchname=branchname,
+        data=data,
+        filename=filename,
+        form=form,
+    )