diff --git a/src/register.c b/src/register.c
index 4160c03..0afa363 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2011,12 +2011,18 @@
 	    }
 
 	    do {
+#ifdef FEAT_FLOAT
+		double multlen = (double)count * (double)yanklen;
+
+		totlen = count * yanklen;
+		if ((double)totlen != multlen)
+#else
 		long multlen = count * yanklen;
 
+		// this only works when sizeof(int) != sizeof(long)
 		totlen = multlen;
-		if (count != 0 && yanklen != 0
-			&& (totlen != multlen || totlen / count != yanklen
-						 || totlen / yanklen != count))
+		if (totlen != multlen)
+#endif
 		{
 		    emsg(_(e_resulting_text_too_long));
 		    break;
diff --git a/src/version.c b/src/version.c
index 98f666e..27331c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3575,
+/**/
     3574,
 /**/
     3573,