diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 1ab18d0..572d7f8 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2515,7 +2515,8 @@ static int accel_remap_huge_pages(void *start, size_t size, const char *name, si
        MAP_PRIVATE | MAP_ANONYMOUS,
        -1, 0);
    if (mem == MAP_FAILED) {
-       zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME ": mmap failed: %s (%d)", strerror(errno), errno);
+       zend_error(E_WARNING,
+               ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap failed: %s (%d)", strerror(errno), errno);
        return -1;
    }
    memcpy(mem, start, size);
@@ -2533,23 +2534,35 @@ static int accel_remap_huge_pages(void *start, size_t size, const char *name, si
            MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
            -1, 0);
        if (ret == MAP_FAILED) {
-           zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME ": mmap failed: %s (%d)", strerror(errno), errno);
+           zend_error(E_WARNING,
+                   ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap(FIXED) failed: %s (%d)",
+                   strerror(errno), errno);
            munmap(mem, size);
            return -1;
        }
        if (-1 == madvise(start, size, MADV_HUGEPAGE)) {
-           zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME ": madvise failed: %s (%d)", strerror(errno), errno);
+           zend_error(E_WARNING,
+                   ACCELERATOR_PRODUCT_NAME " huge_code_pages: madvise(HUGEPAGE) failed: %s (%d)",
+                   strerror(errno), errno);
            munmap(mem, size);
            return -1;
        }
 #  else
-       zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME ": mmap failed: %s (%d)", strerror(errno), errno);
+       ret = mmap(start, size,
+               PROT_READ | PROT_WRITE | PROT_EXEC,
+               MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+       if (ret == MAP_FAILED) {
+           /* this should never happen */
+       }
+       memcpy(start, mem, size);
+       zend_error(E_WARNING,
+               ACCELERATOR_PRODUCT_NAME "huge_code_pages: mmap(HUGETLB) failed: %s (%d)", strerror(errno), errno);
        return -1;
 #  endif
    }

    if (ret == start) {
-       memcpy(start, mem, size);
+       memcpy(start, mem, size);
        mprotect(start, size, PROT_READ | PROT_EXEC);
    }
    munmap(mem, size);