diff --git a/src/components/Document/Document.js b/src/components/Document/Document.js
index ab26504d6..2fbac163c 100644
--- a/src/components/Document/Document.js
+++ b/src/components/Document/Document.js
@@ -27,9 +27,10 @@ class Document extends React.Component {
     return (
       <div className={ styles.container }>
         <PublishingInfo
-          avatarUrl={ this.props.document.user.avatarUrl }
+          document={ this.props.document }
           name={ this.props.document.user.name }
-          timestamp={ this.props.document.createdAt }
+          createdAt={ this.props.document.createdAt }
+          updatedAt={ this.props.document.updatedAt }
         />
         <DocumentHtml html={ this.props.document.html } />
       </div>
diff --git a/src/components/DocumentPreview/DocumentPreview.js b/src/components/DocumentPreview/DocumentPreview.js
index d81c8bcb3..97b219066 100644
--- a/src/components/DocumentPreview/DocumentPreview.js
+++ b/src/components/DocumentPreview/DocumentPreview.js
@@ -18,7 +18,7 @@ class Document extends React.Component {
         <PublishingInfo
           avatarUrl={ this.props.document.user.avatarUrl }
           name={ this.props.document.user.name }
-          timestamp={ document.createdAt }
+          createdAt={ document.createdAt }
         />
 
         <Link
diff --git a/src/components/PublishingInfo/PublishingInfo.js b/src/components/PublishingInfo/PublishingInfo.js
index a41b33dd5..36402005f 100644
--- a/src/components/PublishingInfo/PublishingInfo.js
+++ b/src/components/PublishingInfo/PublishingInfo.js
@@ -12,6 +12,11 @@ const PublishingInfo = (props) => {
       <Avatar src={ props.avatarUrl } size={ 24 } />
       <span className={ styles.userName }>
         { props.name } published { moment(props.timestamp).fromNow() }
+        { props.createdAt !== props.updatedAt ? (
+          <span>
+            &nbsp;and modified { moment(props.timestamp).fromNow() }
+          </span>
+        ) : null }
       </span>
     </Flex>
   );
@@ -20,7 +25,8 @@ const PublishingInfo = (props) => {
 PublishingInfo.propTypes = {
   avatarUrl: React.PropTypes.string.isRequired,
   name: React.PropTypes.string.isRequired,
-  timestamp: React.PropTypes.string.isRequired,
+  createdAt: React.PropTypes.string.isRequired,
+  updatedAt: React.PropTypes.string.isRequired,
 };
 
 export default PublishingInfo;
\ No newline at end of file