diff --git a/ChangeLog b/ChangeLog
index 42b1151d116a602178fea28b76522ba26e8ebb33..4cae810b5d4bada62fd9936f70e309360a8b2f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -345,7 +345,7 @@ Tue Feb 21 2017 Krzysztof Czurylo <krzysztof.czurylo@intel.com>
 	The pmem_is_pmem() function will now return true only if the entire
 	range is mapped directly from Device DAX (/dev/daxX.Y) without an
 	intervening file system, and only if the corresponding file mapping
-	was created with pmem_map_file().  See libpmem(3) for details.
+	was created with pmem_map_file().  See libpmem(7) for details.
 
 	Bug fixes:
 	- jemalloc: fix test compilation on Fedora 26 (rawhide)
diff --git a/doc/libpmemblk/libpmemblk.7.md b/doc/libpmemblk/libpmemblk.7.md
index 99aa62753ead7709cc18bd7a9eee6c00828aef61..19beb2ee3905eca443c3f5e93b0df0490f3ee596 100644
--- a/doc/libpmemblk/libpmemblk.7.md
+++ b/doc/libpmemblk/libpmemblk.7.md
@@ -112,7 +112,7 @@ type of file system results in the load/store, non-paged access to pmem.
 This library is for applications that need a potentially large array of blocks,
 all the same size, where any given block is updated atomically (the update
 cannot be *torn* by program interruption such as power failures). This library
-builds on the low-level pmem support provided by **libpmem**(3), handling the
+builds on the low-level pmem support provided by **libpmem**(7), handling the
 transactional update of the blocks, flushing to persistence, and recovery for
 the application. **libpmemblk** is one of a collection of persistent memory
 libraries available, the others are:
diff --git a/doc/libpmemlog/pmemlog_append.3.md b/doc/libpmemlog/pmemlog_append.3.md
index 36a71fce83a2429a876f8c65d23263c2aaa77f6e..789ad2330f2c22889701a4dee4754d1f0891246d 100644
--- a/doc/libpmemlog/pmemlog_append.3.md
+++ b/doc/libpmemlog/pmemlog_append.3.md
@@ -90,7 +90,7 @@ On error, they return -1 and set *errno* appropriately.
 
 # NOTES #
 
-Since **libpmemlog**(3) is designed as a low-latency code path,
+Since **libpmemlog**(7) is designed as a low-latency code path,
 many of the checks routinely done by the operating system for **writev**(2)
 are not practical in the library's implementation of **pmemlog_appendv**().
 No attempt is made to detect NULL or incorrect pointers, for example.
diff --git a/doc/poolset/poolset.5.md b/doc/poolset/poolset.5.md
index 19e166ad7e29ee5a0b964991103aa33ac279597d..e8ca479634097e070b6315d34499e05e98956590 100644
--- a/doc/poolset/poolset.5.md
+++ b/doc/poolset/poolset.5.md
@@ -189,7 +189,7 @@ REPLICA [<user>@]<hostname> [<relative-path>/]<remote-pool-set-file>
 client
 
 + *pathname* is relative to the root config directory on the target
-node - see **librpmem**(3)
+node - see **librpmem**(7)
 
 There are no other lines in the remote replica section - the REPLICA line
 defines a remote replica entirely.
@@ -296,11 +296,11 @@ be done with the **pmemobj_create**(3), **pmemblk_create**(3) or
 
 Restoring data from a local _WINUX(,or remote) replica can be done by using the
 **pmempool-sync**(1) command or the _UW(pmempool_sync) API from the
-**libpmempool**(3) library.
+**libpmempool**(7) library.
 
 Modifications of a pool set file configuration can be done by using the
 **pmempool-transform**(1) command or the _UW(pmempool_transform) API from the
-**libpmempool**(3) library.
+**libpmempool**(7) library.
 
 When creating a pool set consisting of multiple files, or when creating
 a replicated pool set, the *path* argument passed to **pmemobj_create**(3),
diff --git a/src/examples/libpmemobj/setjmp.c b/src/examples/libpmemobj/setjmp.c
index fa2f79750bee34647b4dec0cfbd43ec3361cb6d7..9aed06ccc8731ab2fd474211479ffb6970df61f4 100644
--- a/src/examples/libpmemobj/setjmp.c
+++ b/src/examples/libpmemobj/setjmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016, Intel Corporation
+ * Copyright 2016-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +33,7 @@
 /*
  * setjmp.c -- example illustrating an issue with indeterminate value
  * of non-volatile automatic variables after transaction abort.
- * See libpmemobj(3) for details.
+ * See libpmemobj(7) for details.
  *
  * NOTE: To observe the problem (likely segfault on a second call to free()),
  * the example program should be compiled with optimizations enabled (-O2).
diff --git a/src/include/README b/src/include/README
index 6a15fc59c294416ea5d4e652e239d392a4a1154e..0821705b079060e69dcde9a136957b7456b2fb85 100644
--- a/src/include/README
+++ b/src/include/README
@@ -12,18 +12,18 @@ the source for their module.
 
 Here you'll find:
 
-libpmem.h -- definitions of libpmem entry points (see libpmem(3))
+libpmem.h -- definitions of libpmem entry points (see libpmem(7))
 
-libpmemblk.h -- definitions of libpmemblk entry points (see libpmemblk(3))
+libpmemblk.h -- definitions of libpmemblk entry points (see libpmemblk(7))
 
-libpmemlog.h -- definitions of libpmemlog entry points (see libpmemlog(3))
+libpmemlog.h -- definitions of libpmemlog entry points (see libpmemlog(7))
 
-libpmemobj.h -- definitions of libpmemobj entry points (see libpmemobj(3))
+libpmemobj.h -- definitions of libpmemobj entry points (see libpmemobj(7))
 
-libvmem.h -- definitions of libvmem entry points (see libvmem(3))
+libvmem.h -- definitions of libvmem entry points (see libvmem(7))
 
-libvmmalloc.h -- definitions of libvmmalloc entry points (see libvmmalloc(3))
+libvmmalloc.h -- definitions of libvmmalloc entry points (see libvmmalloc(7))
 
 Experimental libraries:
 
-librpmem.h -- definitions of librpmem entry points (see librpmem(3))
+librpmem.h -- definitions of librpmem entry points (see librpmem(7))
diff --git a/src/include/libpmem.h b/src/include/libpmem.h
index 60902743581f923fe0ba743553b5aa7b1b2f93c3..40c51d5e39a758d4174554c66571ef973f3f0574 100644
--- a/src/include/libpmem.h
+++ b/src/include/libpmem.h
@@ -37,7 +37,7 @@
  *
  * libpmem provides support for using raw pmem directly.
  *
- * See libpmem(3) for details.
+ * See libpmem(7) for details.
  */
 
 #ifndef LIBPMEM_H
diff --git a/src/include/libpmemblk.h b/src/include/libpmemblk.h
index 232f821cc7c248aadc054eb9e6e019df4feb4e05..9fbc65ddab016e36c17d4690a3a25be7450679ce 100644
--- a/src/include/libpmemblk.h
+++ b/src/include/libpmemblk.h
@@ -37,7 +37,7 @@
  *
  * libpmemblk provides support for arrays of atomically-writable blocks.
  *
- * See libpmemblk(3) for details.
+ * See libpmemblk(7) for details.
  */
 
 #ifndef LIBPMEMBLK_H
diff --git a/src/include/libpmemlog.h b/src/include/libpmemlog.h
index f608582a56c173c48ed72fa95f64a06b633ce181..ef08d7f365538e3793057fbf3b362bf4c535216e 100644
--- a/src/include/libpmemlog.h
+++ b/src/include/libpmemlog.h
@@ -37,7 +37,7 @@
  *
  * libpmemlog provides support for pmem-resident log files.
  *
- * See libpmemlog(3) for details.
+ * See libpmemlog(7) for details.
  */
 
 #ifndef LIBPMEMLOG_H
diff --git a/src/include/libpmemobj.h b/src/include/libpmemobj.h
index ea7fde2707cd2b7452bb9a4cd238bab79c6a5a41..019633cb995f62e41f6ace2f2e79607d5fe744a5 100644
--- a/src/include/libpmemobj.h
+++ b/src/include/libpmemobj.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
  *
  * libpmemobj provides a pmem-resident transactional object store.
  *
- * See libpmemobj(3) for details.
+ * See libpmemobj(7) for details.
  */
 
 #ifndef LIBPMEMOBJ_H
diff --git a/src/include/libpmempool.h b/src/include/libpmempool.h
index 144601feec28573ad63d210b1515f9dc60560c99..c08a95609f18ce0912781627688deb8ce5fc5a0e 100644
--- a/src/include/libpmempool.h
+++ b/src/include/libpmempool.h
@@ -33,7 +33,7 @@
 /*
  * libpmempool.h -- definitions of libpmempool entry points
  *
- * See libpmempool(3) for details.
+ * See libpmempool(7) for details.
  */
 
 #ifndef LIBPMEMPOOL_H
diff --git a/src/include/librpmem.h b/src/include/librpmem.h
index b9fb26143d4a9f1c5fe821cb097a64aac466c286..ea3fc49026638304f6e91e0cf3fc9481e8b52f51 100644
--- a/src/include/librpmem.h
+++ b/src/include/librpmem.h
@@ -36,7 +36,7 @@
  * This library provides low-level support for remote access to persistent
  * memory utilizing RDMA-capable RNICs.
  *
- * See librpmem(3) for details.
+ * See librpmem(7) for details.
  */
 
 #ifndef LIBRPMEM_H
diff --git a/src/include/libvmem.h b/src/include/libvmem.h
index d9d841397280ddf0ad787148c56a84aa47e615ae..24bf1ce843aa4deb0dd6ec42d597db75417e01a9 100644
--- a/src/include/libvmem.h
+++ b/src/include/libvmem.h
@@ -35,7 +35,7 @@
  *
  * This library exposes memory-mapped files as volatile memory (a la malloc)
  *
- * See libvmem(3) for details.
+ * See libvmem(7) for details.
  */
 
 #ifndef LIBVMEM_H
diff --git a/src/include/libvmmalloc.h b/src/include/libvmmalloc.h
index 4afcb6a18818228264e64f1198d587e5467a3bbe..a77b487002a944d35a0e61605c3523bef221c6fc 100644
--- a/src/include/libvmmalloc.h
+++ b/src/include/libvmmalloc.h
@@ -35,7 +35,7 @@
  *
  * This library exposes memory-mapped files as volatile memory (a la malloc)
  *
- * See libvmmalloc(3) for details.
+ * See libvmmalloc(7) for details.
  */
 
 #ifndef LIBVMMALLOC_H
diff --git a/src/tools/pmempool/README b/src/tools/pmempool/README
index 6799c0008805cdee7553f31f778bcfb3fa444b8a..8347ff18bada5d26c5b9acbb66db3517cea0a804 100644
--- a/src/tools/pmempool/README
+++ b/src/tools/pmempool/README
@@ -145,7 +145,7 @@ All features are described below.
 
  * It is possible to walk through the usable data using fixed data chunk size.
    This feature uses similar approach as pmemlog_walk() function. For details
-   please refer to libpmemlog(3).
+   please refer to libpmemlog(7).
 
 ** Features for *blk* pool type