diff --git a/master.cfg b/master.cfg
index f432c9e..97f0a18 100644
--- a/master.cfg
+++ b/master.cfg
@@ -300,7 +300,11 @@ send to the gdb-testers mailing list."""
         st = log.getStep ()
         if st.getResults ()[0] == FAILURE:
             n = st.getName ()
-            if n == 'update gdb master repo':
+            if 'No space left on device' in log.getText ():
+                text += "*** Internal error on buildslave (no space left on device). ***\n"
+                text += "*** Please report this to the buildslave owner (see <%s/buildslaves/%s>) ***\n\n" % (master_status.getBuildbotURL (), build.getSlavename ())
+                continue
+            elif n == 'update gdb master repo':
                 text += "*** Failed to update master GDB git repository.  The build can continue. ***\n\n"
                 continue
             elif n == 'update gdb repo':