diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 7faa3bbfd3e..2ccf0bfd9dd 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -157,9 +157,14 @@ module_dealloc(PyModuleObject *m)
 static PyObject *
 module_repr(PyModuleObject *m)
 {
-	char buf[400];
+	static int template1len = sizeof("<module '' (built-in)>") + 1;
+	static int template2len = sizeof("<module '' from ''>") + 1;
+
+	char *buf;
 	char *name;
 	char *filename;
+	PyObject *rtn;
+
 	name = PyModule_GetName((PyObject *)m);
 	if (name == NULL) {
 		PyErr_Clear();
@@ -168,12 +173,19 @@ module_repr(PyModuleObject *m)
 	filename = PyModule_GetFilename((PyObject *)m);
 	if (filename == NULL) {
 		PyErr_Clear();
-		sprintf(buf, "<module '%.80s' (built-in)>", name);
-	} else {
-		sprintf(buf, "<module '%.80s' from '%.255s'>", name, filename);
+		buf = PyObject_MALLOC(
+			sizeof(char) * (strlen(name) + template1len));
+		sprintf(buf, "<module '%s' (built-in)>", name);
 	}
-
-	return PyString_FromString(buf);
+	else {
+		buf = PyObject_MALLOC(
+			sizeof(char) * (strlen(name) + strlen(filename) +
+					template2len));
+		sprintf(buf, "<module '%s' from '%s'>", name, filename);
+	}
+	rtn = PyString_FromString(buf);
+	PyObject_FREE(buf);
+	return rtn;
 }
 
 /* We only need a traverse function, no clear function: If the module