diff --git a/img/inline-edit-add-file-suggestion.png b/img/inline-edit-add-file-suggestion.png
new file mode 100644
index 0000000..25a33f8
--- /dev/null
+++ b/img/inline-edit-add-file-suggestion.png
Binary files differ
diff --git a/img/inline-edit-create-change-project-screen-dialog.png b/img/inline-edit-create-change-project-screen-dialog.png
new file mode 100644
index 0000000..ea5daa9
--- /dev/null
+++ b/img/inline-edit-create-change-project-screen-dialog.png
Binary files differ
diff --git a/img/inline-edit-create-change-project-screen.png b/img/inline-edit-create-change-project-screen.png
new file mode 100644
index 0000000..e9c7033
--- /dev/null
+++ b/img/inline-edit-create-change-project-screen.png
Binary files differ
diff --git a/img/inline-edit-create-follow-up-change.png b/img/inline-edit-create-follow-up-change.png
new file mode 100644
index 0000000..3e81eee
--- /dev/null
+++ b/img/inline-edit-create-follow-up-change.png
Binary files differ
diff --git a/img/inline-edit-download-change-edit.png b/img/inline-edit-download-change-edit.png
new file mode 100644
index 0000000..e80759a
--- /dev/null
+++ b/img/inline-edit-download-change-edit.png
Binary files differ
diff --git a/img/inline-edit-edit-in-diff-screen-patch-list.png b/img/inline-edit-edit-in-diff-screen-patch-list.png
new file mode 100644
index 0000000..bdbc59d
--- /dev/null
+++ b/img/inline-edit-edit-in-diff-screen-patch-list.png
Binary files differ
diff --git a/img/inline-edit-edit-in-patch-list.png b/img/inline-edit-edit-in-patch-list.png
new file mode 100644
index 0000000..9a31e02
--- /dev/null
+++ b/img/inline-edit-edit-in-patch-list.png
Binary files differ
diff --git a/img/inline-edit-enter-edit-mode-from-comment-box.png b/img/inline-edit-enter-edit-mode-from-comment-box.png
new file mode 100644
index 0000000..3163d5b
--- /dev/null
+++ b/img/inline-edit-enter-edit-mode-from-comment-box.png
Binary files differ
diff --git a/img/inline-edit-enter-edit-mode-from-diff.png b/img/inline-edit-enter-edit-mode-from-diff.png
new file mode 100644
index 0000000..46dd0ff
--- /dev/null
+++ b/img/inline-edit-enter-edit-mode-from-diff.png
Binary files differ
diff --git a/img/inline-edit-enter-edit-mode-from-file-list.png b/img/inline-edit-enter-edit-mode-from-file-list.png
new file mode 100644
index 0000000..d03a517
--- /dev/null
+++ b/img/inline-edit-enter-edit-mode-from-file-list.png
Binary files differ
diff --git a/img/inline-edit-file-list-in-edit-mode.png b/img/inline-edit-file-list-in-edit-mode.png
new file mode 100644
index 0000000..0f52bcf
--- /dev/null
+++ b/img/inline-edit-file-list-in-edit-mode.png
Binary files differ
diff --git a/img/inline-edit-full-screen-editor.png b/img/inline-edit-full-screen-editor.png
new file mode 100644
index 0000000..0249973
--- /dev/null
+++ b/img/inline-edit-full-screen-editor.png
Binary files differ
diff --git a/img/inline-edit-publish-or-delete.png b/img/inline-edit-publish-or-delete.png
new file mode 100644
index 0000000..42c2a57
--- /dev/null
+++ b/img/inline-edit-publish-or-delete.png
Binary files differ
diff --git a/img/inline-edit-rebase-or-delete.png b/img/inline-edit-rebase-or-delete.png
new file mode 100644
index 0000000..ff21f42
--- /dev/null
+++ b/img/inline-edit-rebase-or-delete.png
Binary files differ
diff --git a/presentations/gerrit-inline-edit/gerrit-inline-edit.txt b/presentations/gerrit-inline-edit/gerrit-inline-edit.txt
new file mode 100644
index 0000000..f273111
--- /dev/null
+++ b/presentations/gerrit-inline-edit/gerrit-inline-edit.txt
@@ -0,0 +1,179 @@
+= Inline Edit in Gerrit
+:backend: slidy
+:max-width: 70em
+
+[[title-page]]
+== Inline Edit in Gerrit
+
+== Overview
+
+* Motivation
+* Design
+* Create change
+* Edit change
+* Review change edit
+* Change edit actions
+* Future work
+
+== Motivation
+
+* Allow to modify repository content directly in a browser
+* As a change owner: Address reviewer comments
+* As a reviewier: Fix the patch directly and shorten comment, wait, re-review loop 
+* Low barrier to contribute to a project
+* Other collaboration platforms have this feature
+
+== Design
+
+* Inline changes are done in context of a change
+* Multiple files can be modified in context of a change edit:
++
+no "one modification -- one commit" limitation
++
+* Regular patch sets are stored on ref:
++
+`refs/changes/CC/CCCC/P` where
++
+`CC/CCCC` is sharded representation of change number
++
+* Change edits are stored in special ref:
++
+`refs/users/UU/UUUU/edit-CCCC/P` where
++
+`UU/UUUU` is sharded representation of user account,
++
+`CCCC` is change number and
++
+`P` is the patch set number it is based on
++
+* There is max. one edit per user per change
+* Change edit can be deleted or published and promoted to regular patch set
+* When change edit is based on non-current patch set, it must be rebased
+
+== Creating a New Draft Change
+
+* A new draft change can be created directly in the browser
+* It is not necessary to clone the whole repository to make trivial changes
+* There are two different ways to create an empty change:
+
+== Creating a New Draft Change
+
+* By clicking on the 'Create Change' button in the project screen:
++
+image:../../img/inline-edit-create-change-project-screen.png[]
+
+== Creating a New Draft Change
+
+* The user can select the branch on which the new change should be created:
++
+image:../../img/inline-edit-create-change-project-screen-dialog.png[]
+
+== Creating a New Draft Change
+
+* By clicking the 'Follow-Up' button on the change screen
++
+to create a new draft change based on the selected change:
++
+image:../../img/inline-edit-create-follow-up-change.png[]
+
+[[create-change-from-project-info-screen]]
+
+== Editing Changes
+
+* To switch to edit mode, press the 'Edit' button at the top of the file list:
++
+image:../../img/inline-edit-enter-edit-mode-from-file-list.png[]
+
+== Editing Changes
+
+* In edit mode, files can be added, deleted and renamed
+* To switch from edit mode back to review mode, click the 'Done Editing' button
++
+image:../../img/inline-edit-file-list-in-edit-mode.png[]
+
+== Editing Changes
+
+* Autocompletion suggestion helps to find file in the repository
+
+image:../../img/inline-edit-add-file-suggestion.png[]
+
+== Editing Changes
+
+* While in edit mode, clicking on a file name in the file list opens a full-screen editor
+* To save edits, click the 'Save' button or press `Ctrl-S/Cmd-S`
+* To return to the change screen, click the 'Close' button
+
+image:../../img/inline-edit-full-screen-editor.png[]
+
+== Editing Changes
+
+* It is possible to switch directly to edit mode from the side by side screen
+* By clicking on the edit icon in the patch set list
+
+image:../../img/inline-edit-enter-edit-mode-from-diff.png[]
+
+== Editing Changes
+
+* It is possible to switch directly to edit mode from the side by side screen
+* By clicking on the 'Fix' button in the comment box (the line is preserved)
+
+image:../../img/inline-edit-enter-edit-mode-from-comment-box.png[]
+
+== Reviewing Change Edits
+
+* Change edits are reviewed in the same way as regular patch sets
+* Change edits are shown as 'edit' in the patch list
+on the diff screen:
+
+image:../../img/inline-edit-edit-in-diff-screen-patch-list.png[]
+
+== Reviewing Change Edits
+
+Change edits are shown as 'edit' on the change screen:
+
+image:../../img/inline-edit-edit-in-patch-list.png[]
+
+== Change Edit actions
+
+* To publish change edit click on 'Publish Edit' button
+* To delete change edit click on 'Delete Edit' button
+
+image:../../img/inline-edit-publish-or-delete.png[]
+
+== Change Edit actions
+
+* To rebase change edit click on 'Rebase Edit' button:
+
+image:../../img/inline-edit-rebase-or-delete.png[]
+
+== Change Edit actions
+
+* Select the desired scheme to download change edit:
+
+image:../../img/inline-edit-download-change-edit.png[]
+
+== Future work
+
+* Allow to customize inline editor appearance per user base: color,
++
+syntax highlighting, key maps (Emacs, Sublime, Vim), etc.
++
+* Allow change edits to be pushed with 'git push HEAD:refs/for/master%edit'
+* Mark changed files in context of change edit in file table
+* Reuse inline edit feature for conflict resolution during rebase operation
+
+== Questions
+
+* ???
+
+++++
+<style type="text/css">
+#title-page {
+  border-bottom: 0;
+  text-align: center;
+  position: relative;
+  top: 30%;
+  font-size: 60px;
+}
+</style>
+++++
diff --git a/presentations/gerrit-inline-edit/makeslides b/presentations/gerrit-inline-edit/makeslides
new file mode 100755
index 0000000..1599a4d
--- /dev/null
+++ b/presentations/gerrit-inline-edit/makeslides
@@ -0,0 +1 @@
+asciidoc -a icons -a iconsdir=/opt/local/etc/asciidoc/images/icons gerrit-inline-edit.txt