diff --git a/Documentation/lfsck.txt b/Documentation/lfsck.txt
index 9245420ad3a05c8d8fff208fbc26b1b12ebc4f66..7e589738f3528eca483835cfc1d06c8f07235f86 100644
--- a/Documentation/lfsck.txt
+++ b/Documentation/lfsck.txt
@@ -174,7 +174,7 @@ References
 
 source code: 	   file:/lustre/lfsck/
 
-operations manual: http://build.whamcloud.com/job/lustre-manual/lastSuccessfulBuild/artifact/lustre_manual.xhtml#dbdoclet.lfsckadmin
+operations manual: https://build.hpdd.intel.com/job/lustre-manual/lastSuccessfulBuild/artifact/lustre_manual.xhtml#dbdoclet.lfsckadmin
 
 useful links:      http://insidehpc.com/2013/05/02/video-lfsck-online-lustre-file-system-checker/
                    http://www.opensfs.org/wp-content/uploads/2013/04/Zhuravlev_LFSCK.pdf
diff --git a/configure.ac b/configure.ac
index b772a0f28e8a229db24f0988ac17f55c5ca57c99..92cd6ee496e72d837b078edf3244f118040e8469 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
+AC_INIT([Lustre], [LUSTRE_VERSION], [https://jira.hpdd.intel.com/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
 AC_CONFIG_AUX_DIR([config])
diff --git a/contrib/git-hooks/commit-msg b/contrib/git-hooks/commit-msg
index c1fed2ee1f9b4a43bb6ee5a6daf65c9d49cfbfad..25a6281ae56ffd6273690af667953334aef07f36 100755
--- a/contrib/git-hooks/commit-msg
+++ b/contrib/git-hooks/commit-msg
@@ -168,7 +168,7 @@ usage() {
         exec 1>&2
         cat <<- EOF
 
-	See http://wiki.whamcloud.com/display/PUB/Commit+Comments
+	See https://wiki.hpdd.intel.com/display/PUB/Commit+Comments
 	for full details.  An example valid commit comment is:
 
 	LU-nnn component: short description of change under 64 columns
diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 24c3a1ee72a9323fee833557a60c743ee7b75ef3..77d0470e0170e4065540943bb0aa12f494630dca 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -168,7 +168,7 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
     Path to an existing lustre source tarball to use.
 
   --nodownload
-    Do not try to download a kernel from downloads.lustre.org
+    Do not try to download a kernel from downloads.hpdd.intel.com
 
   --nosrc
     Do not build a .src.rpm, a full kernel patch, or a patched kernel
@@ -431,7 +431,7 @@ download_srpm() {
     if $force || [ ! -r "$KERNELDIR/$srpm" ] ||
        [ ! -s "$KERNELDIR/$srpm" ]; then
         if $DOWNLOAD; then
-            local location="http://downloads.lustre.org/public/kernels/$target/old"
+            local location="https://downloads.hpdd.intel.com/public/kernels/$target/old"
             # get the location from a distro specific method if it exists
             if type -p kernel_srpm_location; then
                 location=$(kernel_srpm_location)
diff --git a/contrib/scripts/libcfs_cleanup.sed b/contrib/scripts/libcfs_cleanup.sed
index ea3cad21a93876d114ba9a6f045fce10d0899c88..0d3586bbc2fd469615a1a41a58fcef2f5702fd7c 100644
--- a/contrib/scripts/libcfs_cleanup.sed
+++ b/contrib/scripts/libcfs_cleanup.sed
@@ -2,7 +2,7 @@
 
 # Script to cleanup libcfs macros, it runs against the tree at build time.
 # Migrate libcfs to emulate Linux kernel APIs.
-# http://jira.whamcloud.com/browse/LU-1346
+# https://jira.hpdd.intel.com/browse/LU-1346
 
 # Run this script like:
 #	find libcfs lnet lustre -name "*.[ch]" | grep -v gnilnd |
diff --git a/debian/control b/debian/control
index 950a70596c317d3ede24f1361c0ec757473c8a00..a988fd625e025de0b632794d23625531ba5d146a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Depends: ${kpatch:Depends}
 Recommends: kernel-package, quilt
 Description: Linux kernel patch for the Lustre Filesystem
  Lustre is a scalable, secure, robust, highly-available
- cluster file system. This release is maintained by Whamcloud, Inc.
- and available from http://wiki.whamcloud.com/
+ cluster file system. This release is maintained by Intel Corporation
+ and available from https://wiki.hpdd.intel.com/
  .
  Lustre servers require a number of patches to the core Linux kernel,
  mostly to export new functions, add features to ext3, and add
@@ -35,8 +35,8 @@ Priority: optional
 Depends: module-assistant, bzip2, debhelper (>= 5.0.0), libsnmp-dev, dpatch
 Description: source for Lustre filesystem client kernel modules
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from
+ https://wiki.hpdd.intel.com/
  .
  This package contains the module source. The client kernel modules
  can be built for kernels from 2.6.18 - 2.6.26 from it using
@@ -49,8 +49,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Userspace utilities for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from
+ https://wiki.hpdd.intel.com/
  .
  This package provides a number of userspace utilities for
  maintaining Lustre filesystems.
@@ -62,8 +62,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from 
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from 
+ https://wiki.hpdd.intel.com/
  .
  This package provides a number of test utilities for the Lustre filesystem.
 
@@ -74,7 +74,7 @@ Architecture: i386 powerpc amd64 ia64
 Depends: lustre-utils (= ${binary:Version})
 Description: Development files for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from
+ https://wiki.hpdd.intel.com/
  .
  This package provides development libraries for the Lustre filesystem.
diff --git a/debian/control.main b/debian/control.main
index 950a70596c317d3ede24f1361c0ec757473c8a00..a988fd625e025de0b632794d23625531ba5d146a 100644
--- a/debian/control.main
+++ b/debian/control.main
@@ -16,8 +16,8 @@ Depends: ${kpatch:Depends}
 Recommends: kernel-package, quilt
 Description: Linux kernel patch for the Lustre Filesystem
  Lustre is a scalable, secure, robust, highly-available
- cluster file system. This release is maintained by Whamcloud, Inc.
- and available from http://wiki.whamcloud.com/
+ cluster file system. This release is maintained by Intel Corporation
+ and available from https://wiki.hpdd.intel.com/
  .
  Lustre servers require a number of patches to the core Linux kernel,
  mostly to export new functions, add features to ext3, and add
@@ -35,8 +35,8 @@ Priority: optional
 Depends: module-assistant, bzip2, debhelper (>= 5.0.0), libsnmp-dev, dpatch
 Description: source for Lustre filesystem client kernel modules
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from
+ https://wiki.hpdd.intel.com/
  .
  This package contains the module source. The client kernel modules
  can be built for kernels from 2.6.18 - 2.6.26 from it using
@@ -49,8 +49,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Userspace utilities for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from
+ https://wiki.hpdd.intel.com/
  .
  This package provides a number of userspace utilities for
  maintaining Lustre filesystems.
@@ -62,8 +62,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from 
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from 
+ https://wiki.hpdd.intel.com/
  .
  This package provides a number of test utilities for the Lustre filesystem.
 
@@ -74,7 +74,7 @@ Architecture: i386 powerpc amd64 ia64
 Depends: lustre-utils (= ${binary:Version})
 Description: Development files for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- This release is maintained by Whamcloud, Inc. and available from
- http://wiki.whamcloud.com/
+ This release is maintained by Intel Corporation and available from
+ https://wiki.hpdd.intel.com/
  .
  This package provides development libraries for the Lustre filesystem.
diff --git a/lnet/ChangeLog b/lnet/ChangeLog
index 2a8a11e5a04042c22b5624a0b2e6ca3951f5bca4..aadf97c2a67ebe4d14a0a3f010da67c7d5431712 100644
--- a/lnet/ChangeLog
+++ b/lnet/ChangeLog
@@ -1,4 +1,4 @@
-TBD       Whamcloud, Inc.
+TBD       Intel Corporation
 	* version 2.2.0
 	* Support for networks:
 	 socklnd   - any kernel supported by Lustre,
diff --git a/lustre.spec.in b/lustre.spec.in
index c314717fd4556f0a2a5399d8d7b83622f94b11bb..d28ac6a0967389c44869d3f617060ec5faa7f5c4 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -97,7 +97,7 @@ Release: %{fullrelease}
 License: GPL
 Group: Utilities/System
 Source: lustre-%{version}.tar.gz
-URL: http://wiki.whamcloud.com/
+URL: https://wiki.hpdd.intel.com/
 BuildRoot: %{_tmppath}/lustre-%{version}-root
 Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
 Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
diff --git a/lustre/BUGS b/lustre/BUGS
index 571f4f71bc2fe298d8cd99729ac9bbf748a0c01f..e98de376686e56eb2110a6eef8fabded30510dab 100644
--- a/lustre/BUGS
+++ b/lustre/BUGS
@@ -1 +1 @@
-To report bugs, please visit http://bugs.whamcloud.com/
+To report bugs, please visit https://jira.hpdd.intel.com/
diff --git a/lustre/BUILDING b/lustre/BUILDING
index f54cb07976666b2e412426b94c8ef9ec505bbd29..af5e767d783bcb3324fd0d186c780c619ffeaba2 100644
--- a/lustre/BUILDING
+++ b/lustre/BUILDING
@@ -4,7 +4,7 @@ BUILDING LUSTRE
 You must already have a Lustre-patched kernel, which is outside of the
 scope of this document.  For more information on this process, see the
 web sites below.  Also consider downloading a pre-packaged Lustre
-kernel and utilities from http://downloads.lustre.org/
+kernel and utilities from https://downloads.hpdd.intel.com/
 
 To build:
   sh autogen.sh
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 812d33b2b1e88b8eebdf27653ed23ae98df26a6e..0f6a9481a5609b477293faab6d001137a3c93ab1 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,6 +1,6 @@
 TBD Intel Corporation
        * version 2.7.0
-       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+       * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix
          for currently supported client and server kernel versions.
        * Server known to build on patched kernels:
          2.6.32-431.20.3.el6 (RHEL6.5)
@@ -21,7 +21,7 @@ TBD Intel Corporation
 
 07-30-2014 Intel Corporation
        * version 2.6.0
-       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+       * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix
          for currently supported client and server kernel versions.
        * Server known to build on patched kernels:
          2.6.32-431.20.3.el6 (RHEL6.5)
@@ -42,7 +42,7 @@ TBD Intel Corporation
 
 10-31-2013 Intel Corporation
        * version 2.5.0
-       * See http://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix
+       * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix
        * Server builds for kernels:
          2.6.32-358.18.1.el6  (RHEL6.4)
        * Client builds for unpatched kernels:
@@ -60,7 +60,7 @@ TBD Intel Corporation
 
 05-30-2013 Intel Corporation
        * version 2.4.0
-       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+       * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix
        * Server builds for kernels:
          2.6.32-358.6.2.el6  (RHEL6.4)
        * Client builds for unpatched kernels:
@@ -78,7 +78,7 @@ TBD Intel Corporation
 
 9-30-2012 Whamcloud, Inc.
        * version 2.3.0
-       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+       * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix
        * Server support for kernels:
 	 2.6.32-279.5.1.el6 (RHEL6)
        * Client support for unpatched kernels:
@@ -117,7 +117,7 @@ Description: Update RHEL6.2 kernel to 2.6.32-220.7.1.el6
 
 04-30-2012 Whamcloud, Inc.
        * version 2.2.0
-       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+       * See https://wiki.hpdd.intel.com/display/PUB/Lustre+Support+Matrix
        * Server support for kernels:
          2.6.32-220.4.2.el6  (RHEL6)
        * Client support for unpatched kernels:
diff --git a/lustre/doc/lfs-hsm.1 b/lustre/doc/lfs-hsm.1
index 580d921ceb4bdd11c44f9bacff78caf823dccc3c..dc18373481c0161a1aaa0c1e185c5c452c6f3d85 100644
--- a/lustre/doc/lfs-hsm.1
+++ b/lustre/doc/lfs-hsm.1
@@ -75,6 +75,6 @@ Written by Aurelien Degremont.
 
 .SH KNOWN BUGS
 .PP
-Please report all bugs to http://jira.whamcloud.com/
+Please report all bugs to https://jira.hpdd.intel.com/
 .SH SEE ALSO
 .BR lfs (1)
diff --git a/lustre/doc/lustre.7 b/lustre/doc/lustre.7
index fac9292484ae22969969d2f9e0cfcab8465962b8..3e05ff62c72f10db5fb84c7d526c0697fa00ed65 100644
--- a/lustre/doc/lustre.7
+++ b/lustre/doc/lustre.7
@@ -59,13 +59,13 @@ individual files.
 Format multiple Lustre targets simultaneously from definitions in a CSV
 file.
 .SH BUGS
-Please report all bugs http://bugs.whamcloud.com/
+Please report all bugs https://jira.hpdd.intel.com/
 .SH AVAILABILITY
 .B The
 .BR Lustre (7) 
 filesystem package is available via
 .br
-http://downloads.whamcloud.com/
+https://downloads.hpdd.intel.com/
 .SH SEE ALSO
 .BR mkfs.lustre (8),
 .BR tunefs.lustre (8),
diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 6417d558eba599e4964d51d6b0a080447c13fc85..d0b77086d04877231a95ffde229fe6c47b77fdca 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -2170,7 +2170,7 @@ void ll_delete_inode(struct inode *inode)
 		spin_unlock_irq(&inode->i_data.tree_lock);
                 LASSERTF(inode->i_data.nrpages == 0,
 			 "inode="DFID"(%p) nrpages=%lu, see "
-			 "http://jira.whamcloud.com/browse/LU-118\n",
+			 "https://jira.hpdd.intel.com/browse/LU-118\n",
 			 PFID(ll_inode2fid(inode)), inode,
                          inode->i_data.nrpages);
         }
diff --git a/lustre/ofd/ofd_obd.c b/lustre/ofd/ofd_obd.c
index 7b3fa77762b2f5162210939859fb7f6775906d59..cd14949c8b96190b627add23d3cba54ed7be297e 100644
--- a/lustre/ofd/ofd_obd.c
+++ b/lustre/ofd/ofd_obd.c
@@ -127,7 +127,7 @@ static int ofd_parse_connect_data(const struct lu_env *env,
 		CWARN("!!! This export (nid %s) used object group %d "
 		      "earlier; now it's trying to use group %d!  This could "
 		      "be a bug in the MDS. Please report to "
-		      "http://bugs.whamcloud.com/\n",
+		      "https://jira.hpdd.intel.com/\n",
 		      obd_export_nid2str(exp), fed->fed_group,
 		      data->ocd_group);
 		RETURN(-EPROTO);
diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 38b0d99bcc99e146ac63649d99444ae4e81883a9..80b195ac3d1c49d67841f60f4e38aca9604afdd7 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1162,7 +1162,7 @@ static inline int can_merge_pages(struct brw_page *p1, struct brw_page *p2)
                  * safe to combine */
                 if (unlikely((p1->flag & mask) != (p2->flag & mask))) {
                         CWARN("Saw flags 0x%x and 0x%x in the same brw, please "
-                              "report this at http://bugs.whamcloud.com/\n",
+                              "report this at https://jira.hpdd.intel.com/\n",
                               p1->flag, p2->flag);
                 }
                 return 0;
diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c
index fdb7915deec6cc440ba41b13cb94a9e749a0a003..a2e6fef64ac7041a10a2599516e83c95815c3ba4 100644
--- a/lustre/osd-ldiskfs/osd_io.c
+++ b/lustre/osd-ldiskfs/osd_io.c
@@ -158,7 +158,7 @@ static void dio_complete_routine(struct bio *bio, int error)
 		CERROR("***** bio->bi_private is NULL!  This should never "
 		       "happen.  Normally, I would crash here, but instead I "
 		       "will dump the bio contents to the console.  Please "
-		       "report this to <http://jira.whamcloud.com/> , along "
+		       "report this to <https://jira.hpdd.intel.com/> , along "
 		       "with any interesting messages leading up to this point "
 		       "(like SCSI errors, perhaps).  Because bi_private is "
 		       "NULL, I can't wake up the thread that initiated this "
diff --git a/lustre/utils/mount_utils_ldiskfs.c b/lustre/utils/mount_utils_ldiskfs.c
index 3815d7247ff34c72136341548c375ae057c7345a..6df4e45fddbae282f4fff106c40a1b05ad612874 100644
--- a/lustre/utils/mount_utils_ldiskfs.c
+++ b/lustre/utils/mount_utils_ldiskfs.c
@@ -409,7 +409,7 @@ static void disp_old_e2fsprogs_msg(const char *feature, int make_backfs)
 		E2FSPROGS, feature);
 #if !(HAVE_LDISKFSPROGS)
 	fprintf(stderr, "Please install the latest version of e2fsprogs from\n"
-		"http://downloads.whamcloud.com/public/e2fsprogs/latest/\n"
+		"https://downloads.hpdd.intel.com/public/e2fsprogs/latest/\n"
 		"to enable this feature.\n");
 #endif
 	if (make_backfs)