diff --git a/ChangeLog b/ChangeLog
index cb98b3959b..9d5b48d54e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 26 06:35:41 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_before_heap_sweep): Restructure code to mean clearly.
+	  heap->freelist is connected to end of list.
+
 Sat Oct 26 04:01:35 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (gc_before_heap_sweep): fix freelist management.
diff --git a/gc.c b/gc.c
index f4fb2c3ae9..89875253e3 100644
--- a/gc.c
+++ b/gc.c
@@ -2483,18 +2483,11 @@ gc_before_heap_sweep(rb_objspace_t *objspace, rb_heap_t *heap)
     heap->free_pages = NULL;
 
     if (heap->using_page) {
-	if (heap->using_page->freelist) {
-	    RVALUE *pstart = heap->using_page->freelist;
-	    RVALUE *p = heap->using_page->freelist;
-	    while (p->as.free.next) {
-		p = p->as.free.next;
-	    }
-	    p->as.free.next = heap->freelist;
-	    heap->using_page->freelist = pstart;
-	}
-	else {
-	    heap->using_page->freelist = heap->freelist;
+	RVALUE **p = &heap->using_page->freelist;
+	while (*p) {
+	    p = &(*p)->as.free.next;
 	}
+	*p = heap->freelist;
 	heap->using_page = NULL;
     }
     heap->freelist = NULL;