diff --git a/src/misc1.c b/src/misc1.c
index a3a20597be..589a145cc5 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -363,7 +363,7 @@ copy_indent(size, src)
 
 	/* Fill to next tabstop with a tab, if possible */
 	tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts);
-	if (todo >= tab_pad)
+	if (todo >= tab_pad && !curbuf->b_p_et)
 	{
 	    todo -= tab_pad;
 	    ++ind_len;
@@ -372,7 +372,7 @@ copy_indent(size, src)
 	}
 
 	/* Add tabs required for indent */
-	while (todo >= (int)curbuf->b_p_ts)
+	while (todo >= (int)curbuf->b_p_ts && !curbuf->b_p_et)
 	{
 	    todo -= (int)curbuf->b_p_ts;
 	    ++ind_len;
diff --git a/src/testdir/test19.in b/src/testdir/test19.in
index bdcfb77dba..ff6e255174 100644
--- a/src/testdir/test19.in
+++ b/src/testdir/test19.in
@@ -12,6 +12,9 @@ r
 0wR			
 :" Test replacing with Tabs
 0wR			
+:" Test that copyindent works with expandtab set
+:set expandtab smartindent copyindent ts=8 sw=8 sts=8
+:exe "norm! o{\<cr>x"
 :?^start?,$w! test.out
 :qa!
 ENDTEST
diff --git a/src/testdir/test19.ok b/src/testdir/test19.ok
index ba4eb63beb..23d51507db 100644
--- a/src/testdir/test19.ok
+++ b/src/testdir/test19.ok
@@ -5,3 +5,5 @@ test text
     a cde
     		hi
 test text
+{
+        x
diff --git a/src/version.c b/src/version.c
index c3614035c4..be9f058db2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    301,
 /**/
     300,
 /**/